backport the tidy breed function, but dont change working code

* ca2758622c
non-passive mobs fight back when attacked (thx fluxionary)
2024-03-30 02:53:31 -04:00 · 2024-03-30 02:45:00 -04:00 · 2024-03-30 02:36:06 -04:00 · 2024-03-30 01:45:33 -04:00 · 2024-03-30 01:41:54 -04:00 · 2023-08-08 08:31:52 -04:00
20 changed files with 512 additions and 422 deletions
--- a/.luacheckrc
+++ b/.luacheckrc
@ -3,7 +3,6 @@ unused_args = false
 read_globals = {
    "minetest",
    "lucky_block",
-    "intllib",
    "vector",
    "table",
    "invisibility",
--- a/api.lua
+++ b/api.lua
@ -1,4 +1,4 @@
-local MP = minetest.get_modpath(minetest.get_current_modname())
+local MP = minetest.get_modpath("mobs")
 -- Check for translation method
 local S

@ -21,22 +21,29 @@ else
 		end
 	end
 end
+local FS = function(...) return minetest.formspec_escape(S(...)) end
+

 -- CMI support check
 local use_cmi = minetest.global_exists("cmi")

+-- MineClone2 check
+local use_mc2 = minetest.get_modpath("mcl_core")
+
+-- Global
 mobs = {
 	mod = "redo",
-	version = "20230726",
-	intllib = S,
+	version = "20230927",
+	translate = S, intllib = S,
 	invis = minetest.global_exists("invisibility") and invisibility or {},
 	node_ice = "default:ice",
-	node_snow = minetest.registered_aliases["mapgen_snow"] or "default:snow" or "mcl_core:snow",
-	node_dirt = minetest.registered_aliases["mapgen_dirt"] or "default:dirt" or "mcl_core:dirt"
+	node_snow = minetest.registered_aliases["mapgen_snow"]
+			or (use_mc2 and "mcl_core:snow") or "default:snow",
+	node_dirt = minetest.registered_aliases["mapgen_dirt"]
+			or (use_mc2 and "mcl_core:dirt") or "default:dirt"
 }
 mobs.fallback_node = mobs.node_dirt

-
 -- localize common functions
 local pi = math.pi
 local square = math.sqrt
@ -268,7 +275,7 @@ end
 -- are we a real player ?
 local function is_player(player)

-	if player and type(player) == "userdata" and minetest.is_player(player) then
+	if player and type(player) == "userdata" then
 		return true
 	end
 end
@ -279,7 +286,6 @@ function mob_class:collision()

 	local pos = self.object:get_pos() ; if not pos then return {0, 0} end
 	local x, z = 0, 0
-	local vel = self.object:get_velocity()
 	local width = -self.collisionbox[1] + self.collisionbox[4] + 0.5

 	for _,object in ipairs(minetest.get_objects_inside_radius(pos, width)) do
@ -372,7 +378,7 @@ function mob_class:set_velocity(v)
 	end

 	-- set velocity
-	local vel = self.object:get_velocity() or 0
+	local vel = self.object:get_velocity() or {x = 0, y = 0, z = 0}

 	local new_vel = {
 		x = (sin(yaw) * -v) + c_x,
@ -1323,26 +1329,24 @@ function mob_class:do_jump()
 	and not self.facing_fence
 	and self.looking_at ~= mobs.node_snow then

-		local v = self.object:get_velocity()
-
-		v.y = self.jump_height
+		vel.y = self.jump_height

 		self:set_animation("jump") -- only if defined

-		self.object:set_velocity(v)
+		self.object:set_velocity(vel)

 		-- when in air move forward
-		minetest.after(0.3, function(self, v)
+		minetest.after(0.3, function(self, vel)

 			if self.object:get_luaentity() then

 				self.object:set_acceleration({
-					x = v.x * 2,
+					x = vel.x * 2,
 					y = 0,
-					z = v.z * 2
+					z = vel.z * 2
 				})
 			end
-		end, self, v)
+		end, self, vel)

 		if self:get_velocity() > 0 then
 			self:mob_sound(self.sounds.jump)
@ -1583,6 +1587,8 @@ function mob_class:breed()
 					-- make sure baby is actually there
 					if ent2 then

+						textures = self.base_texture
+
 						-- using specific child texture (if found)
 						if self.child_texture then
 							textures = self.child_texture[1]
@ -2481,6 +2487,11 @@ function mob_class:do_states(dtime)
 			self:set_velocity(0)
 			self.state = "stand"
 			self:set_animation("stand")
+
+			-- try to turn so we are not stuck
+			yaw = yaw + random(-1, 1) * 1.5
+			yaw = self:set_yaw(yaw, 4)
+
 		else
 			self:set_velocity(self.run_velocity)
 			self:set_animation("walk")
@ -3120,15 +3131,16 @@ function mob_class:on_punch(hitter, tflp, tool_capabilities, dir, damage)
 		self.following = nil
 	end

-	local name = hitter:get_player_name() or ""
+	local hitter_name = ""
+	if hitter then if is_player(hitter) then hitter_name = hitter:get_player_name() end end

 	-- attack puncher and call other mobs for help
 	if self.passive == false
 	and self.state ~= "flop"
 	and self.child == false
 	and self.attack_players == true
-	and hitter:get_player_name() ~= self.owner
-	and not is_invisible(self, name)
+	and not (is_player(hitter) and hitter_name == self.owner)
+	and not is_invisible(self, hitter_name)
 	and self.object ~= hitter then

 		-- attack whoever punched mob
@ -3137,25 +3149,25 @@ function mob_class:on_punch(hitter, tflp, tool_capabilities, dir, damage)

 		-- alert others to the attack
 		local objs = minetest.get_objects_inside_radius(hitter:get_pos(), self.view_range)
-		local obj
+		local ent

 		for n = 1, #objs do

-			obj = objs[n]:get_luaentity()
+			ent = objs[n] and objs[n]:get_luaentity()

-			if obj and obj._cmi_is_mob then
+			if ent and ent._cmi_is_mob then

 				-- only alert members of same mob and assigned helper
-				if obj.group_attack == true
-				and obj.state ~= "attack"
-				and obj.owner ~= name
-				and (obj.name == self.name or obj.name == self.group_helper) then
-					obj:do_attack(hitter)
+				if ent.group_attack == true
+				and ent.state ~= "attack"
+				and not (is_player(hitter) and ent.owner == hitter_name)
+				and (ent.name == self.name or ent.name == self.group_helper) then
+					ent:do_attack(hitter)
 				end

 				-- have owned mobs attack player threat
-				if obj.owner == name and obj.owner_loyal then
-					obj:do_attack(self.object)
+				if is_player(hitter) and ent.owner == hitter_name and ent.owner_loyal then
+					ent:do_attack(self.object)
 				end
 			end
 		end
@ -3429,7 +3441,7 @@ function mob_class:mob_expire(pos, dtime)
 				end
 			end

--			minetest.log("action", S("lifetimer expired, removed @1", self.name))
+--			minetest.log("action", "lifetimer expired, removed " .. self.name)

 			effect(pos, 15, "tnt_smoke.png", 2, 4, 2, 0)

@ -3671,7 +3683,7 @@ function mobs:register_mob(name, def)
 minetest.register_entity(name, setmetatable({

 	stepheight = def.stepheight,
-	name = name,
+	name = (name:find(":") and name or ":"..name),
 	type = def.type,
 	attack_type = def.attack_type,
 	fly = def.fly,
@ -3924,6 +3936,8 @@ function mobs:add_mob(pos, def)
 	if not ent then
 --print("[mobs] entity not found " .. def.name)
 		return false
+	else
+		effect(pos, 15, "tnt_smoke.png", 1, 2, 2, 15, 5)
 	end

 	if def.child then
@ -4241,7 +4255,7 @@ function mobs:register_arrow(name, def)

 	if not name or not def then return end -- errorcheck

-	minetest.register_entity(name, {
+	minetest.register_entity( (name:find(":") and name or ":"..name) , {

 		physical = def.physical or false,
 		collide_with_objects = def.collide_with_objects or false,
@ -4755,11 +4769,7 @@ function mobs:feed_tame(self, clicker, feed_count, breed, tame)

 		-- increase health
 		self.health = self.health + 4
-
-		if self.health >= self.hp_max then
-
-			self.health = self.hp_max
-		end
+		if self.health >= self.hp_max then self.health = self.hp_max end

 		self.object:set_hp(self.health)

@ -4816,8 +4826,7 @@ function mobs:feed_tame(self, clicker, feed_count, breed, tame)

 	-- if mob has been tamed you can name it with a nametag
 	if item:get_name() == "mobs:nametag"
-	and (name == self.owner
-	or minetest.check_player_privs(name, "protection_bypass")) then
+	and (name == self.owner or minetest.check_player_privs(name, "protection_bypass")) then

 		-- store mob and nametag stack in external variables
 		mob_obj[name] = self
@ -4826,13 +4835,9 @@ function mobs:feed_tame(self, clicker, feed_count, breed, tame)
 		local tag = self.nametag or ""
 		local esc = minetest.formspec_escape

-		minetest.show_formspec(name, "mobs_nametag",
-			"size[8,4]" ..
-			"field[0.5,1;7.5,0;name;" ..
-			esc(S("Enter name:")) ..
-			";" .. tag .. "]" ..
-			"button_exit[2.5,3.5;3,1;mob_rename;" ..
-			esc(S("Rename")) .. "]")
+		minetest.show_formspec(name, "mobs_nametag", "size[8,4]"
+			.. "field[0.5,1;7.5,0;name;" .. esc(FS("Enter name:")) .. ";" .. tag .. "]"
+			.. "button_exit[2.5,3.5;3,1;mob_rename;" .. esc(FS("Rename")) .. "]")

 		return true
 	end
@ -4847,9 +4852,9 @@ function mobs:feed_tame(self, clicker, feed_count, breed, tame)
 			end

 			minetest.chat_send_player(clicker:get_player_name(),
-					S("@1 follows:\n- @2",
-					self.name:split(":")[2],
-					table.concat(self.follow, "\n- ")))
+					S("@1 follows:",
+					self.name:split(":")[2]) .. "\n" ..
+					table.concat(self.follow, "\n- "))
 		end
 	end

@ -4913,7 +4918,7 @@ function mobs:alias_mob(old_name, new_name)
 	minetest.register_alias(old_name, new_name)

 	-- entity
-	minetest.register_entity(":" .. old_name, {
+	minetest.register_entity( (old_name:find(":") and old_name or ":"..old_name) , {

 		physical = false, static_save = false,

--- a/crafts.lua
+++ b/crafts.lua
@ -1,5 +1,6 @@

-local S = mobs.intllib
+local S = mobs.translate
+local FS = function(...) return minetest.formspec_escape(S(...)) end
 local mc2 = minetest.get_modpath("mcl_core")

 -- recipe items
@ -334,9 +335,9 @@ minetest.register_tool(":mobs:mob_reset_stick", {

 			minetest.show_formspec(name, "mobs_texture", "size[8,4]"
 			.. "field[0.5,1;7.5,0;name;"
-			.. minetest.formspec_escape(S("Enter texture:")) .. ";" .. bt .. "]"
+			.. FS("Enter texture:") .. ";" .. bt .. "]"
 			.. "button_exit[2.5,3.5;3,1;mob_texture_change;"
-			.. minetest.formspec_escape(S("Change")) .. "]")
+			.. FS("Change") .. "]")
 		end
 	end
 })
--- a/init.lua
+++ b/init.lua
@ -21,6 +21,9 @@ dofile(path .. "/crafts.lua")
 dofile(path .. "/spawner.lua")

 -- Lucky Blocks
+if minetest.get_modpath("lucky_block") then
 	dofile(path .. "/lucky_block.lua")
+end
+

 print("[MOD] Mobs Redo loaded")
--- a/locale/mobs.de.tr
+++ b/locale/mobs.de.tr
@ -1,34 +1,38 @@
 # textdomain: mobs
-#** Peaceful Mode Active - No Monsters Will Spawn=
-@1 (Tamed)=@1 (Gezähmt)
-@1 at full health (@2)=@1 bei voller Gesundheit (@2)
-@1 has been tamed!=@1 wurde gezähmt!
-@1 is owner!=@1 ist der Besitzer!
-#Active Mob Limit Reached!=
-Already protected!=Bereits geschützt!
-#Change=
-#Command:=
-Enter name:=Namen eingeben:
-#Enter texture:=
-Lasso (right-click animal to put in inventory)=Lasso (Rechtsklick auf Tier, um es zu nehmen)
-Leather=Leder
-Meat=Fleisch
-Missed!=Daneben!
-Mob Fence=Kreaturen Zaun
-#Mob Fence Top=
-Mob Protection Rune=Kreaturschutzrune
-#Mob Reset Stick=
-#Mob Spawner=
-Mob Spawner settings failed!=Kreaturenspawner-Einstellungen gescheitert!
+** Peaceful Mode Active - No Monsters Will Spawn=** Friedlicher Modus aktiv - Es werden keine Monster spawnen
+Active Mob Limit Reached!=Aktives Mob-Limit erreicht!
 Mob has been protected!=Kreatur wurde geschützt!
-Name Tag=Namensschild
-Net (right-click animal to put in inventory)=Netz (Rechtsklick auf Tier, um es zu nehmen)
+@1 (Tamed)=@1 (Gezähmt)
 Not tamed!=Nicht gezähmt!
-Raw Meat=Rohes Fleisch
+@1 is owner!=@1 ist der Besitzer!
+Missed!=Daneben!
+Already protected!=Bereits geschützt!
+@1 has been tamed!=@1 wurde gezähmt!
+@1 follows:=@1 folgt:
+@1 mobs removed.=@1 Mobs entfernt.
+Enter name:=Namen eingeben:
 Rename=Umbenennen
-Saddle=Sattel
-Spawner Active (@1)=Spawner aktiv (@1)
-Spawner Not Active (enter settings)=Nicht aktiv (Einstellungen eingeben)
+Name Tag=Namensschild
+Leather=Leder
+Raw Meat=Rohes Fleisch
+Meat=Fleisch
+Lasso (right-click animal to put in inventory)=Lasso (Rechtsklick auf Tier, um es zu nehmen)
+Net (right-click animal to put in inventory)=Netz (Rechtsklick auf Tier, um es zu nehmen)
 Steel Shears (right-click to shear)=Stahlschere (Rechtsklick zum Scheren)
-#Syntax: “name min_light[0-14] max_light[0-14] max_mobs_in_area[0 to disable] player_distance[1-20] y_offset[-10 to 10]”=
-#lifetimer expired, removed @1=
+Mob Protection Rune=Kreaturschutzrune
+Mob Protection Rune (Level 2)=Kreaturschutzrune (Level 2)
+Saddle=Sattel
+Mob Fence=Kreaturen Zaun
+Mob Fence Top=Kreaturen Zaun Oberteil
+Mob Reset Stick=Kreatur reset Stock
+Meat Block=Fleischblock
+Raw Meat Block=Rohfleisch Blokc
+Enter texture:=Textur eingeben:
+Change=Ändern
+Mob Spawner=Kreaturenspawner
+(mob name) (min light) (max light) (amount) (player distance) (Y offset)=(Kreaturenname) (Min. Licht) (Max. Licht) (Anzahl) (Spielerabstand) (Y-Offset)
+Command:=Befehl:
+Spawner Not Active (enter settings)=Nicht aktiv (Einstellungen eingeben)
+Spawner Active (@1)=Spawner aktiv (@1)
+Mob Spawner settings failed!=Kreaturenspawner-Einstellungen gescheitert!
+Syntax: “name min_light[0-14] max_light[0-14] max_mobs_in_area[0 to disable] player_distance[1-20] y_offset[-10 to 10]”=
--- a/locale/mobs.en.tr
+++ b/locale/mobs.en.tr
@ -1,34 +1,38 @@
 # textdomain: mobs
-#** Peaceful Mode Active - No Monsters Will Spawn=
-#@1 (Tamed)=
-#@1 at full health (@2)=
-#@1 has been tamed!=
-#@1 is owner!=
-#Active Mob Limit Reached!=
-#Already protected!=
-#Change=
-#Command:=
-#Enter name:=
-#Enter texture:=
-#Lasso (right-click animal to put in inventory)=
-#Leather=
-#Meat=
-#Missed!=
-#Mob Fence=
-#Mob Fence Top=
-#Mob Protection Rune=
-#Mob Reset Stick=
-#Mob Spawner=
-#Mob Spawner settings failed!=
-#Mob has been protected!=
-#Name Tag=
-#Net (right-click animal to put in inventory)=
-#Not tamed!=
-#Raw Meat=
-#Rename=
-#Saddle=
-#Spawner Active (@1)=
-#Spawner Not Active (enter settings)=
-#Steel Shears (right-click to shear)=
-#Syntax: “name min_light[0-14] max_light[0-14] max_mobs_in_area[0 to disable] player_distance[1-20] y_offset[-10 to 10]”=
-#lifetimer expired, removed @1=
+** Peaceful Mode Active - No Monsters Will Spawn=
+Active Mob Limit Reached!=
+Mob has been protected!=
+@1 (Tamed)=
+Not tamed!=
+@1 is owner!=
+Missed!=
+Already protected!=
+@1 has been tamed!=
+@1 follows:=
+@1 mobs removed.=
+Enter name:=
+Rename=
+Name Tag=
+Leather=
+Raw Meat=
+Meat=
+Lasso (right-click animal to put in inventory)=
+Net (right-click animal to put in inventory)=
+Steel Shears (right-click to shear)=
+Mob Protection Rune=
+Mob Protection Rune (Level 2)=
+Saddle=
+Mob Fence=
+Mob Fence Top=
+Mob Reset Stick=
+Meat Block=
+Raw Meat Block=
+Enter texture:=
+Change=
+Mob Spawner=
+(mob name) (min light) (max light) (amount) (player distance) (Y offset)=
+Command:=
+Spawner Not Active (enter settings)=
+Spawner Active (@1)=
+Mob Spawner settings failed!=
+Syntax: “name min_light[0-14] max_light[0-14] max_mobs_in_area[0 to disable] player_distance[1-20] y_offset[-10 to 10]”=
--- a/locale/mobs.es.tr
+++ b/locale/mobs.es.tr
@ -1,34 +1,38 @@
 # textdomain: mobs
-#** Peaceful Mode Active - No Monsters Will Spawn=
-@1 (Tamed)=@1 (Domesticado)
-@1 at full health (@2)=@1 con salud llena (@2)
-@1 has been tamed!=@1 ha sido domesticado!
-@1 is owner!=@1 es el dueño!
-#Active Mob Limit Reached!=
-Already protected!=Ya está protegido!
-#Change=
-#Command:=
-Enter name:=Ingrese nombre:
-#Enter texture:=
-Lasso (right-click animal to put in inventory)=Lazo (click derecho en animal para colocar en inventario)
-Leather=Cuero
-Meat=Carne
-Missed!=Perdido!
-#Mob Fence=
-#Mob Fence Top=
-Mob Protection Rune=Runa de protección de Mob
-#Mob Reset Stick=
-#Mob Spawner=
-Mob Spawner settings failed!=Configuracion de generador de Mob falló!
+** Peaceful Mode Active - No Monsters Will Spawn=
+Active Mob Limit Reached!=
 Mob has been protected!=El mob ha sido protegido!
-Name Tag=Nombrar etiqueta
-Net (right-click animal to put in inventory)=Red (click derecho en animal para colocar en inventario)
+@1 (Tamed)=@1 (Domesticado)
 Not tamed!=No domesticado!
-Raw Meat=Carne cruda
+@1 is owner!=@1 es el dueño!
+Missed!=Perdido!
+Already protected!=Ya está protegido!
+@1 has been tamed!=@1 ha sido domesticado!
+@1 follows:=
+@1 mobs removed.=
+Enter name:=Ingrese nombre:
 Rename=Renombrar
-Saddle=Montura
-Spawner Active (@1)=Generador activo (@1)
-Spawner Not Active (enter settings)=Generador no activo (ingrese config)
+Name Tag=Nombrar etiqueta
+Leather=Cuero
+Raw Meat=Carne cruda
+Meat=Carne
+Lasso (right-click animal to put in inventory)=Lazo (click derecho en animal para colocar en inventario)
+Net (right-click animal to put in inventory)=Red (click derecho en animal para colocar en inventario)
 Steel Shears (right-click to shear)=Tijera de acero (click derecho para esquilar)
-#Syntax: “name min_light[0-14] max_light[0-14] max_mobs_in_area[0 to disable] player_distance[1-20] y_offset[-10 to 10]”=
-#lifetimer expired, removed @1=
+Mob Protection Rune=Runa de protección de Mob
+Mob Protection Rune (Level 2)=
+Saddle=Montura
+Mob Fence=
+Mob Fence Top=
+Mob Reset Stick=
+Meat Block=
+Raw Meat Block=
+Enter texture:=
+Change=
+Mob Spawner=
+(mob name) (min light) (max light) (amount) (player distance) (Y offset)=
+Command:=
+Spawner Not Active (enter settings)=Generador no activo (ingrese config)
+Spawner Active (@1)=Generador activo (@1)
+Mob Spawner settings failed!=Configuracion de generador de Mob falló!
+Syntax: “name min_light[0-14] max_light[0-14] max_mobs_in_area[0 to disable] player_distance[1-20] y_offset[-10 to 10]”=
--- a/locale/mobs.fr.tr
+++ b/locale/mobs.fr.tr
@ -1,34 +1,38 @@
 # textdomain: mobs
 ** Peaceful Mode Active - No Monsters Will Spawn=** Mode pacifique activé - aucun monstre ne sera généré
-@1 (Tamed)=@1 (apprivoisé)
-@1 at full health (@2)=@1 est en pleine forme (@2) 
-@1 has been tamed!=@1 a été apprivoisé ! 
-@1 is owner!=Appartient à @1 !
 Active Mob Limit Reached!=Limite atteinte du nombre des êtres vivants actifs !
-Already protected!=Déjà protégé !
-Change=Changer
-Command:=Commande :
-Enter name:=Saisissez un nom :
-Enter texture:=Saisissez une texture :
-Lasso (right-click animal to put in inventory)=Lasso (clic droit sur l'animal pour le mettre dans l'inventaire)
-Leather=Cuir
-Meat=Viande
+Mob has been protected!=L'animal a été protégé !
+@1 (Tamed)=@1 (apprivoisé)
+Not tamed!=Non-apprivoisé !
+@1 is owner!=Appartient à @1 !
 Missed!=Raté !
+Already protected!=Déjà protégé !
+@1 has been tamed!=@1 a été apprivoisé ! 
+@1 follows:=
+@1 mobs removed.=
+Enter name:=Saisissez un nom :
+Rename=Renommer
+Name Tag=Étiquette de collier
+Leather=Cuir
+Raw Meat=Viande crue
+Meat=Viande
+Lasso (right-click animal to put in inventory)=Lasso (clic droit sur l'animal pour le mettre dans l'inventaire)
+Net (right-click animal to put in inventory)=Filet (clic droit sur l'animal pour le mettre dans l'inventaire)
+Steel Shears (right-click to shear)=Ciseaux à laine (clic droit pour tondre)
+Mob Protection Rune=Rune de protection des animaux
+Mob Protection Rune (Level 2)=
+Saddle=Selle
 Mob Fence= Clôture à animaux
 Mob Fence Top=Haut de clôture à animaux
-Mob Protection Rune=Rune de protection des animaux
 Mob Reset Stick=Baguette de réinitialisation des êtres vivants
+Meat Block=
+Raw Meat Block=
+Enter texture:=Saisissez une texture :
+Change=Changer
 Mob Spawner=Créateur d'êtres vivants
-Mob Spawner settings failed!=Échec des paramètres du créateur d'être vivants !
-Mob has been protected!=L'animal a été protégé !
-Name Tag=Étiquette de collier
-Net (right-click animal to put in inventory)=Filet (clic droit sur l'animal pour le mettre dans l'inventaire)
-Not tamed!=Non-apprivoisé !
-Raw Meat=Viande crue
-Rename=Renommer
-Saddle=Selle
-Spawner Active (@1)=Créateur actif (@1)
+(mob name) (min light) (max light) (amount) (player distance) (Y offset)=
+Command:=Commande :
 Spawner Not Active (enter settings)=Créateur non actif (entrez les paramètres)
-Steel Shears (right-click to shear)=Ciseaux à laine (clic droit pour tondre)
+Spawner Active (@1)=Créateur actif (@1)
+Mob Spawner settings failed!=Échec des paramètres du créateur d'être vivants !
 Syntax: “name min_light[0-14] max_light[0-14] max_mobs_in_area[0 to disable] player_distance[1-20] y_offset[-10 to 10]”=Syntaxe : «name min_lumière[0-14] max_lumière[0-14] max_être_vivant_dans_région[0 pour désactiver] distance_joueur[1-20] décalage_y[-10 to 10]»
-lifetimer expired, removed @1=Être immortel expiré ; @1 retiré
--- a/locale/mobs.it.tr
+++ b/locale/mobs.it.tr
@ -1,34 +1,38 @@
 # textdomain: mobs
 ** Peaceful Mode Active - No Monsters Will Spawn=** Modalità pacifica attiva - non comparirà nessun mostro
-@1 (Tamed)=@1 (Addomesticato)
-@1 at full health (@2)=@1 in piena salute (@2)
-@1 has been tamed!=@1 è stato addomesticato!
-@1 is owner!=Il padrone è @1!
-#Active Mob Limit Reached!=
-Already protected!=Già protetto!
-#Change=
-#Command:=
-Enter name:=Inserire il nome:
-#Enter texture:=
-Lasso (right-click animal to put in inventory)=Lazo (click di destro per mettere l'animale nell'inventario)
-Leather=Pelle
-Meat=Carne
-Missed!=Mancato!
-Mob Fence=Recinzione per mob
-#Mob Fence Top=
-Mob Protection Rune=Runa di protezione per mob
-#Mob Reset Stick=
-#Mob Spawner=
-Mob Spawner settings failed!=Impostazioni del generatore di mob fallite!
+Active Mob Limit Reached!=
 Mob has been protected!=Il mob è stato protetto!
-Name Tag=Targhetta
-Net (right-click animal to put in inventory)=Rete (click destro per mettere l'animale nell'inventario)
+@1 (Tamed)=@1 (Addomesticato)
 Not tamed!=Non addomesticato!
-Raw Meat=Carne cruda
+@1 is owner!=Il padrone è @1!
+Missed!=Mancato!
+Already protected!=Già protetto!
+@1 has been tamed!=@1 è stato addomesticato!
+@1 follows:=
+@1 mobs removed.=
+Enter name:=Inserire il nome:
 Rename=Rinomina
-Saddle=Sella
-Spawner Active (@1)=Generatore attivo (@1)
-Spawner Not Active (enter settings)=Generatore inattivo (inserire le impostazioni)
+Name Tag=Targhetta
+Leather=Pelle
+Raw Meat=Carne cruda
+Meat=Carne
+Lasso (right-click animal to put in inventory)=Lazo (click di destro per mettere l'animale nell'inventario)
+Net (right-click animal to put in inventory)=Rete (click destro per mettere l'animale nell'inventario)
 Steel Shears (right-click to shear)=Cesoie d'acciaio (click destro per tosare)
-#Syntax: “name min_light[0-14] max_light[0-14] max_mobs_in_area[0 to disable] player_distance[1-20] y_offset[-10 to 10]”=
-#lifetimer expired, removed @1=
+Mob Protection Rune=Runa di protezione per mob
+Mob Protection Rune (Level 2)=
+Saddle=Sella
+Mob Fence=Recinzione per mob
+Mob Fence Top=
+Mob Reset Stick=
+Meat Block=
+Raw Meat Block=
+Enter texture:=
+Change=
+Mob Spawner=
+(mob name) (min light) (max light) (amount) (player distance) (Y offset)=
+Command:=
+Spawner Not Active (enter settings)=Generatore inattivo (inserire le impostazioni)
+Spawner Active (@1)=Generatore attivo (@1)
+Mob Spawner settings failed!=Impostazioni del generatore di mob fallite!
+Syntax: “name min_light[0-14] max_light[0-14] max_mobs_in_area[0 to disable] player_distance[1-20] y_offset[-10 to 10]”=
--- a/locale/mobs.ms.tr
+++ b/locale/mobs.ms.tr
@ -1,34 +1,38 @@
 # textdomain: mobs
 ** Peaceful Mode Active - No Monsters Will Spawn=** Mod Aman Diaktifkan - Tiada Raksasa Akan Muncul
-@1 (Tamed)=@1 (Jinak)
-@1 at full health (@2)=Mata kesihatan @1 telah penuh (@2)
-@1 has been tamed!=@1 telah dijinakkan!
-@1 is owner!=Ini hak milik @1!
-#Active Mob Limit Reached!=
-Already protected!=Telah dilindungi!
-#Change=
-#Command:=
-Enter name:=Masukkan nama:
-#Enter texture:=
-Lasso (right-click animal to put in inventory)=Tanjul (klik-kanan haiwan untuk masukkan ke inventori)
-Leather=Kulit
-Meat=Daging Bakar
-Missed!=Terlepas!
-Mob Fence=Pagar Mob
-#Mob Fence Top=
-Mob Protection Rune=Rune Perlindungan Mob
-#Mob Reset Stick=
-#Mob Spawner=
-Mob Spawner settings failed!=Penetapan Pewujud Mob gagal!
+Active Mob Limit Reached!=
 Mob has been protected!=Mob telah pun dilindungi!
-Name Tag=Tanda Nama
-Net (right-click animal to put in inventory)=Jaring (klik-kanan haiwan untuk masukkan ke inventori)
+@1 (Tamed)=@1 (Jinak)
 Not tamed!=Belum dijinakkan!
-Raw Meat=Daging Mentah
+@1 is owner!=Ini hak milik @1!
+Missed!=Terlepas!
+Already protected!=Telah dilindungi!
+@1 has been tamed!=@1 telah dijinakkan!
+@1 follows:=
+@1 mobs removed.=
+Enter name:=Masukkan nama:
 Rename=Namakan semula
-Saddle=Pelana
-Spawner Active (@1)=Pewujud Mob Aktif (@1)
-Spawner Not Active (enter settings)=Pewujud Mob Tidak Aktif (masukkan tetapan)
+Name Tag=Tanda Nama
+Leather=Kulit
+Raw Meat=Daging Mentah
+Meat=Daging Bakar
+Lasso (right-click animal to put in inventory)=Tanjul (klik-kanan haiwan untuk masukkan ke inventori)
+Net (right-click animal to put in inventory)=Jaring (klik-kanan haiwan untuk masukkan ke inventori)
 Steel Shears (right-click to shear)=Ketam Keluli (klik-kanan untuk mengetam bulu biri-biri)
-#Syntax: “name min_light[0-14] max_light[0-14] max_mobs_in_area[0 to disable] player_distance[1-20] y_offset[-10 to 10]”=
-#lifetimer expired, removed @1=
+Mob Protection Rune=Rune Perlindungan Mob
+Mob Protection Rune (Level 2)=
+Saddle=Pelana
+Mob Fence=Pagar Mob
+Mob Fence Top=
+Mob Reset Stick=
+Meat Block=
+Raw Meat Block=
+Enter texture:=
+Change=
+Mob Spawner=
+(mob name) (min light) (max light) (amount) (player distance) (Y offset)=
+Command:=
+Spawner Not Active (enter settings)=Pewujud Mob Tidak Aktif (masukkan tetapan)
+Spawner Active (@1)=Pewujud Mob Aktif (@1)
+Mob Spawner settings failed!=Penetapan Pewujud Mob gagal!
+Syntax: “name min_light[0-14] max_light[0-14] max_mobs_in_area[0 to disable] player_distance[1-20] y_offset[-10 to 10]”=
--- a/locale/mobs.pt.tr
+++ b/locale/mobs.pt.tr
@ -1,34 +1,38 @@
 # textdomain: mobs
-#** Peaceful Mode Active - No Monsters Will Spawn=
-#@1 (Tamed)=
-@1 at full health (@2)=@1 em plena saude (@2)
-@1 has been tamed!=@1 foi domesticado!
-@1 is owner!=Dono @1!
-#Active Mob Limit Reached!=
-#Already protected!=
-#Change=
-#Command:=
-Enter name:=Insira um nome:
-#Enter texture:=
-Lasso (right-click animal to put in inventory)=Laço (clique-direito no animal para por no inventario)
-Leather=Couro
-Meat=Carne
-Missed!=Faltou!
-#Mob Fence=
-#Mob Fence Top=
-#Mob Protection Rune=
-#Mob Reset Stick=
-#Mob Spawner=
-Mob Spawner settings failed!=Configuraçao de Spawnador do Mob falhou!
-#Mob has been protected!=
-Name Tag=Etiqueta
-Net (right-click animal to put in inventory)=Net (clique-direito no animal para por no inventario)
+** Peaceful Mode Active - No Monsters Will Spawn=
+Active Mob Limit Reached!=
+Mob has been protected!=
+@1 (Tamed)=
 Not tamed!=Indomesticado!
-Raw Meat=Carne crua
+@1 is owner!=Dono @1!
+Missed!=Faltou!
+Already protected!=
+@1 has been tamed!=@1 foi domesticado!
+@1 follows:=
+@1 mobs removed.=
+Enter name:=Insira um nome:
 Rename=Renomear
-#Saddle=
-Spawner Active (@1)=Spawnador Ativo (@1)
-Spawner Not Active (enter settings)=Spawnador Inativo (configurar)
+Name Tag=Etiqueta
+Leather=Couro
+Raw Meat=Carne crua
+Meat=Carne
+Lasso (right-click animal to put in inventory)=Laço (clique-direito no animal para por no inventario)
+Net (right-click animal to put in inventory)=Net (clique-direito no animal para por no inventario)
 Steel Shears (right-click to shear)=Tesoura de Aço (clique-direito para tosquiar)
-#Syntax: “name min_light[0-14] max_light[0-14] max_mobs_in_area[0 to disable] player_distance[1-20] y_offset[-10 to 10]”=
-#lifetimer expired, removed @1=
+Mob Protection Rune=
+Mob Protection Rune (Level 2)=
+Saddle=
+Mob Fence=
+Mob Fence Top=
+Mob Reset Stick=
+Meat Block=
+Raw Meat Block=
+Enter texture:=
+Change=
+Mob Spawner=
+(mob name) (min light) (max light) (amount) (player distance) (Y offset)=
+Command:=
+Spawner Not Active (enter settings)=Spawnador Inativo (configurar)
+Spawner Active (@1)=Spawnador Ativo (@1)
+Mob Spawner settings failed!=Configuraçao de Spawnador do Mob falhou!
+Syntax: “name min_light[0-14] max_light[0-14] max_mobs_in_area[0 to disable] player_distance[1-20] y_offset[-10 to 10]”=
--- a/locale/mobs.ru.tr
+++ b/locale/mobs.ru.tr
@ -1,34 +1,38 @@
 # textdomain: mobs
 ** Peaceful Mode Active - No Monsters Will Spawn=** Мирный модус активирован - монстры не спаунятся
-@1 (Tamed)=@1 (Прирученный)
-@1 at full health (@2)=@1 при полном здоровье (@2)
-@1 has been tamed!=@1 приручен
-@1 is owner!=@1 владелец
-#Active Mob Limit Reached!=
-Already protected!=Уже защищен!
-#Change=
-#Command:=
-Enter name:=Введите имя:
-#Enter texture:=
-Lasso (right-click animal to put in inventory)=Лассо (Правый клик - положить животное в инвентарь)
-Leather=Кожа
-Meat=Мясо
-Missed!=Промазал!
-Mob Fence=Забор от мобов
-#Mob Fence Top=
-Mob Protection Rune=Защитная руна мобов
-#Mob Reset Stick=
-#Mob Spawner=
-Mob Spawner settings failed!=Настройки спаунера моба провалились
+Active Mob Limit Reached!=
 Mob has been protected!=Моб защищен!
-Name Tag=Новый тэг
-Net (right-click animal to put in inventory)=Сеть (Правый клик - положить животное в инвентарь)
+@1 (Tamed)=@1 (Прирученный)
 Not tamed!=Не прирученный
-Raw Meat=Сырое мясо
+@1 is owner!=@1 владелец
+Missed!=Промазал!
+Already protected!=Уже защищен!
+@1 has been tamed!=@1 приручен
+@1 follows:=
+@1 mobs removed.=
+Enter name:=Введите имя:
 Rename=Переименовать
-Saddle=Седло
-Spawner Active (@1)=Активные спаунер (@1)
-Spawner Not Active (enter settings)=Спаунер не активен (введите настройки)
+Name Tag=Новый тэг
+Leather=Кожа
+Raw Meat=Сырое мясо
+Meat=Мясо
+Lasso (right-click animal to put in inventory)=Лассо (Правый клик - положить животное в инвентарь)
+Net (right-click animal to put in inventory)=Сеть (Правый клик - положить животное в инвентарь)
 Steel Shears (right-click to shear)=Ножницы (Правый клик - подстричь)
-#Syntax: “name min_light[0-14] max_light[0-14] max_mobs_in_area[0 to disable] player_distance[1-20] y_offset[-10 to 10]”=
-#lifetimer expired, removed @1=
+Mob Protection Rune=Защитная руна мобов
+Mob Protection Rune (Level 2)=
+Saddle=Седло
+Mob Fence=Забор от мобов
+Mob Fence Top=
+Mob Reset Stick=
+Meat Block=
+Raw Meat Block=
+Enter texture:=
+Change=
+Mob Spawner=
+(mob name) (min light) (max light) (amount) (player distance) (Y offset)=
+Command:=
+Spawner Not Active (enter settings)=Спаунер не активен (введите настройки)
+Spawner Active (@1)=Активные спаунер (@1)
+Mob Spawner settings failed!=Настройки спаунера моба провалились
+Syntax: “name min_light[0-14] max_light[0-14] max_mobs_in_area[0 to disable] player_distance[1-20] y_offset[-10 to 10]”=
--- a/locale/mobs.tr.tr
+++ b/locale/mobs.tr.tr
@ -1,34 +1,38 @@
 # textdomain: mobs
-#** Peaceful Mode Active - No Monsters Will Spawn=
-#@1 (Tamed)=
-@1 at full health (@2)=@1 tam canında (@2)
-@1 has been tamed!=@1 tamamen evcilleştirilmiştir!
-@1 is owner!=Sahibi @1!
-#Active Mob Limit Reached!=
-#Already protected!=
-#Change=
-#Command:=
-Enter name:=İsim gir:
-#Enter texture:=
-Lasso (right-click animal to put in inventory)=Kement (hayvana sağ tıklayarak envantere koy)
-Leather=Deri
-Meat=Et
-Missed!=Kaçırdın!
-Mob Fence=Canavar Yaratıcı
-#Mob Fence Top=
-#Mob Protection Rune=
-#Mob Reset Stick=
-#Mob Spawner=
-Mob Spawner settings failed!=Yaratıcı ayarları uygulanamadı.
-#Mob has been protected!=
-Name Tag=İsim etiketi
-Net (right-click animal to put in inventory)=Ağ (hayvana sağ tıklayarak envantere koy)
+** Peaceful Mode Active - No Monsters Will Spawn=
+Active Mob Limit Reached!=
+Mob has been protected!=
+@1 (Tamed)=
 Not tamed!=Evcil değil!
-Raw Meat=Çiğ et
+@1 is owner!=Sahibi @1!
+Missed!=Kaçırdın!
+Already protected!=
+@1 has been tamed!=@1 tamamen evcilleştirilmiştir!
+@1 follows:=
+@1 mobs removed.=
+Enter name:=İsim gir:
 Rename=Yeniden adlandır
-#Saddle=
-Spawner Active (@1)=Yaratıcı aktif (@1)
-Spawner Not Active (enter settings)=Yaratıcı aktif değil (ayarlara gir)
+Name Tag=İsim etiketi
+Leather=Deri
+Raw Meat=Çiğ et
+Meat=Et
+Lasso (right-click animal to put in inventory)=Kement (hayvana sağ tıklayarak envantere koy)
+Net (right-click animal to put in inventory)=Ağ (hayvana sağ tıklayarak envantere koy)
 Steel Shears (right-click to shear)=Çelik makas (sağ tıklayarak kes)
-#Syntax: “name min_light[0-14] max_light[0-14] max_mobs_in_area[0 to disable] player_distance[1-20] y_offset[-10 to 10]”=
-#lifetimer expired, removed @1=
+Mob Protection Rune=
+Mob Protection Rune (Level 2)=
+Saddle=
+Mob Fence=Canavar Yaratıcı
+Mob Fence Top=
+Mob Reset Stick=
+Meat Block=
+Raw Meat Block=
+Enter texture:=
+Change=
+Mob Spawner=
+(mob name) (min light) (max light) (amount) (player distance) (Y offset)=
+Command:=
+Spawner Not Active (enter settings)=Yaratıcı aktif değil (ayarlara gir)
+Spawner Active (@1)=Yaratıcı aktif (@1)
+Mob Spawner settings failed!=Yaratıcı ayarları uygulanamadı.
+Syntax: “name min_light[0-14] max_light[0-14] max_mobs_in_area[0 to disable] player_distance[1-20] y_offset[-10 to 10]”=
--- a/locale/mobs.zh_CN.tr
+++ b/locale/mobs.zh_CN.tr
@ -1,34 +1,38 @@
 # textdomain: mobs
 ** Peaceful Mode Active - No Monsters Will Spawn=** 和平模式已激活——没有怪物会产生
-@1 (Tamed)=@1（已驯服）
-@1 at full health (@2)=@1已经满血（@2）
-@1 has been tamed!=@1已经被驯服！
-@1 is owner!=@1 是主人
-#Active Mob Limit Reached!=
-Already protected!=已经被保护！
-#Change=
-#Command:=
-Enter name:=输入名称：
-#Enter texture:=
-Lasso (right-click animal to put in inventory)=套索（右键单击动物以放入物品栏）
-Leather=皮革
-Meat=肉
-Missed!=没抓住！
-Mob Fence=Mob 栅栏
-#Mob Fence Top=
-Mob Protection Rune=Mob 保护符文
-#Mob Reset Stick=
-#Mob Spawner=
-Mob Spawner settings failed!=Mob 孵化器设置失败！
+Active Mob Limit Reached!=
 Mob has been protected!=Mob 已经被保护了！
-Name Tag=名称标签
-Net (right-click animal to put in inventory)=网（右键单击动物以放入物品栏）
+@1 (Tamed)=@1（已驯服）
 Not tamed!=没有驯服！
-Raw Meat=生肉
+@1 is owner!=@1 是主人
+Missed!=没抓住！
+Already protected!=已经被保护！
+@1 has been tamed!=@1已经被驯服！
+@1 follows:=
+@1 mobs removed.=
+Enter name:=输入名称：
 Rename=重新命名
-Saddle=鞍
-Spawner Active (@1)=孵化器正在运转（@1）
-Spawner Not Active (enter settings)=孵化器未使用（输入设置）
+Name Tag=名称标签
+Leather=皮革
+Raw Meat=生肉
+Meat=肉
+Lasso (right-click animal to put in inventory)=套索（右键单击动物以放入物品栏）
+Net (right-click animal to put in inventory)=网（右键单击动物以放入物品栏）
 Steel Shears (right-click to shear)=钢剪（右键单击以剪切）
-#Syntax: “name min_light[0-14] max_light[0-14] max_mobs_in_area[0 to disable] player_distance[1-20] y_offset[-10 to 10]”=
-#lifetimer expired, removed @1=
+Mob Protection Rune=Mob 保护符文
+Mob Protection Rune (Level 2)=
+Saddle=鞍
+Mob Fence=Mob 栅栏
+Mob Fence Top=
+Mob Reset Stick=
+Meat Block=
+Raw Meat Block=
+Enter texture:=
+Change=
+Mob Spawner=
+(mob name) (min light) (max light) (amount) (player distance) (Y offset)=
+Command:=
+Spawner Not Active (enter settings)=孵化器未使用（输入设置）
+Spawner Active (@1)=孵化器正在运转（@1）
+Mob Spawner settings failed!=Mob 孵化器设置失败！
+Syntax: “name min_light[0-14] max_light[0-14] max_mobs_in_area[0 to disable] player_distance[1-20] y_offset[-10 to 10]”=
--- a/locale/mobs.zh_TW.tr
+++ b/locale/mobs.zh_TW.tr
@ -1,34 +1,38 @@
 # textdomain: mobs
 ** Peaceful Mode Active - No Monsters Will Spawn=** 和平模式已激活——沒有怪物會產生
-@1 (Tamed)=@1（已馴服）
-@1 at full health (@2)=@1已經滿血（@2）
-@1 has been tamed!=@1已經被馴服！
-@1 is owner!=@1 是主人
-#Active Mob Limit Reached!=
-Already protected!=已經被保護！
-#Change=
-#Command:=
-Enter name:=輸入名稱：
-#Enter texture:=
-Lasso (right-click animal to put in inventory)=套索（右鍵單擊動物以放入物品欄）
-Leather=皮革
-Meat=肉
-Missed!=沒抓住！
-Mob Fence=Mob 柵欄
-#Mob Fence Top=
-Mob Protection Rune=Mob 保護符文
-#Mob Reset Stick=
-#Mob Spawner=
-Mob Spawner settings failed!=Mob 孵化器設置失敗！
+Active Mob Limit Reached!=
 Mob has been protected!=Mob 已經被保護了！
-Name Tag=名稱標籤
-Net (right-click animal to put in inventory)=網（右鍵單擊動物以放入物品欄）
+@1 (Tamed)=@1（已馴服）
 Not tamed!=沒有馴服！
-Raw Meat=生肉
+@1 is owner!=@1 是主人
+Missed!=沒抓住！
+Already protected!=已經被保護！
+@1 has been tamed!=@1已經被馴服！
+@1 follows:=
+@1 mobs removed.=
+Enter name:=輸入名稱：
 Rename=重新命名
-Saddle=鞍
-Spawner Active (@1)=孵化器正在運轉（@1）
-Spawner Not Active (enter settings)=孵化器未使用（輸入設置）
+Name Tag=名稱標籤
+Leather=皮革
+Raw Meat=生肉
+Meat=肉
+Lasso (right-click animal to put in inventory)=套索（右鍵單擊動物以放入物品欄）
+Net (right-click animal to put in inventory)=網（右鍵單擊動物以放入物品欄）
 Steel Shears (right-click to shear)=鋼剪（右鍵單擊以剪切）
-#Syntax: “name min_light[0-14] max_light[0-14] max_mobs_in_area[0 to disable] player_distance[1-20] y_offset[-10 to 10]”=
-#lifetimer expired, removed @1=
+Mob Protection Rune=Mob 保護符文
+Mob Protection Rune (Level 2)=
+Saddle=鞍
+Mob Fence=Mob 柵欄
+Mob Fence Top=
+Mob Reset Stick=
+Meat Block=
+Raw Meat Block=
+Enter texture:=
+Change=
+Mob Spawner=
+(mob name) (min light) (max light) (amount) (player distance) (Y offset)=
+Command:=
+Spawner Not Active (enter settings)=孵化器未使用（輸入設置）
+Spawner Active (@1)=孵化器正在運轉（@1）
+Mob Spawner settings failed!=Mob 孵化器設置失敗！
+Syntax: “name min_light[0-14] max_light[0-14] max_mobs_in_area[0 to disable] player_distance[1-20] y_offset[-10 to 10]”=
--- a/locale/template.txt
+++ b/locale/template.txt
@ -0,0 +1,38 @@
+# textdomain: mobs
+** Peaceful Mode Active - No Monsters Will Spawn=
+Active Mob Limit Reached!=
+Mob has been protected!=
+@1 (Tamed)=
+Not tamed!=
+@1 is owner!=
+Missed!=
+Already protected!=
+@1 has been tamed!=
+@1 follows:=
+@1 mobs removed.=
+Enter name:=
+Rename=
+Name Tag=
+Leather=
+Raw Meat=
+Meat=
+Lasso (right-click animal to put in inventory)=
+Net (right-click animal to put in inventory)=
+Steel Shears (right-click to shear)=
+Mob Protection Rune=
+Mob Protection Rune (Level 2)=
+Saddle=
+Mob Fence=
+Mob Fence Top=
+Mob Reset Stick=
+Meat Block=
+Raw Meat Block=
+Enter texture:=
+Change=
+Mob Spawner=
+(mob name) (min light) (max light) (amount) (player distance) (Y offset)=
+Command:=
+Spawner Not Active (enter settings)=
+Spawner Active (@1)=
+Mob Spawner settings failed!=
+Syntax: “name min_light[0-14] max_light[0-14] max_mobs_in_area[0 to disable] player_distance[1-20] y_offset[-10 to 10]”=
--- a/lucky_block.lua
+++ b/lucky_block.lua
@ -1,6 +1,4 @@

-if minetest.get_modpath("lucky_block") then
-
 lucky_block:add_blocks({
 	{"dro", {"mobs:meat_raw"}, 5},
 	{"dro", {"mobs:meat"}, 5},
@ -15,4 +13,3 @@ if minetest.get_modpath("lucky_block") then
 	{"dro", {"mobs:fence_top"}, 12},
 	{"lig"}
 })
-end
--- a/mod.conf
+++ b/mod.conf
@ -1,4 +1,5 @@
 name = mobs
 depends =default
-optional_depends = tnt, player_api, dye, farming, invisibility, intllib, lucky_block, cmi, toolranks, pathfinder, mtobjid
 description = MOBS api for mobs to add animals or monsters etc
+optional_depends = tnt, player_api, invisibility, intllib, lucky_block, cmi, toolranks, pathfinder, mtobjid
+min_minetest_version = 5.0
--- a/mount.lua
+++ b/mount.lua
@ -1,8 +1,10 @@
 -- lib_mount by Blert2112 (edited by TenPlus1)

--[[ one of these is needed (for now) to ride mobs, otherwise no riding for you
-if not minetest.get_modpath("default")
-or not minetest.get_modpath("player_api") then
+local is_pa = minetest.get_modpath("player_api") -- 5.x compatibility
+local is_mc2 = minetest.get_modpath("mcl_mobs") -- MineClone2 check
+
+-- one of these is needed to ride mobs, otherwise no riding for you
+if not minetest.get_modpath("default") and not is_pa and not is_mc2 then

 	function mobs.attach() end
 	function mobs.detach() end
@ -11,10 +13,6 @@ or not minetest.get_modpath("player_api") then

 	return
 end
-]]
-
-local is_pa = minetest.get_modpath("player_api") -- 5.x compatibility
-local is_mc2 = minetest.get_modpath("mcl_mobs") -- MineClone2 compatibility

 -- are we a real player ?
 local function is_player(player)
@ -25,7 +23,7 @@ local function is_player(player)
 	return false
 end

-
+-- Localise some functions
 local abs, cos, floor, sin, sqrt, pi =
 		math.abs, math.cos, math.floor, math.sin, math.sqrt, math.pi

@ -117,16 +115,18 @@ local function force_detach(player)

 	local name = player:get_player_name()

-	if is_pa then
-		player_api.player_attached[name] = false
-		player_api.set_animation(player, "stand", 30)
-	elseif is_mc2 then
+	if is_mc2 then
 		mcl_player.player_attached[player:get_player_name()] = false
 		mcl_player.player_set_animation(player, "stand", 30)
+	else
+		if is_pa then
+		player_api.player_attached[name] = false
+		player_api.set_animation(player, "stand", 30)
 		else
 		default.player_attached[name] = false
 		default.player_set_animation(player, "stand", 30)
 		end
+	end

 	player:set_eye_offset({x = 0, y = 0, z = 0}, {x = 0, y = 0, z = 0})
 	player:set_properties({visual_size = {x = 1, y = 1}})
@ -209,13 +209,15 @@ function mobs.attach(entity, player)

 	force_detach(player)

-	if is_pa then
-		player_api.player_attached[player:get_player_name()] = true
-	elseif is_mc2 then
+	if is_mc2 then
 		mcl_player.player_attached[player:get_player_name()] = true
+	else
+		if is_pa then
+		player_api.player_attached[player:get_player_name()] = true
 		else
 		default.player_attached[player:get_player_name()] = true
 		end
+	end

 	player:set_attach(entity.object, "", attach_at, entity.player_rotation)
 	player:set_eye_offset(eye_offset, {x = 0, y = 0, z = 0})
@ -231,10 +233,11 @@ function mobs.attach(entity, player)

 		if is_player(player) then

+			if is_mc2 then
+				mcl_player.player_set_animation(player, "sit_mount" , 30)
+			else
 				if is_pa then
 				player_api.set_animation(player, "sit", 30)
-			elseif is_mc2 then
-				mcl_player.player_set_animation(player, "sit_mount" , 30)
 				else
 				default.player_set_animation(player, "sit", 30)
 				end
--- a/spawner.lua
+++ b/spawner.lua
@ -1,5 +1,5 @@

-local S = mobs.intllib
+local S = mobs.translate


 -- are we a real player ?
@ -31,8 +31,7 @@ minetest.register_node("mobs:spawner", {
 				.. " (player distance) (Y offset)")

 		-- text entry formspec
-		meta:set_string("formspec",
-			"size[10,3.5]"
+		meta:set_string("formspec", "size[10,3.5]"
 			.. "label[0.15,0.5;" .. minetest.formspec_escape(head) .. "]"
 			.. "field[1,2.5;8.5,0.8;text;" .. S("Command:")
 			.. ";${command}]")
Author	SHA1	Message	Date
general	c02fdfe5f0	backport the tidy breed function, but dont change working code * `ca2758622c`	2024-03-30 02:53:31 -04:00
general	2e691b95dd	non-passive mobs fight back when attacked (thx fluxionary) * backported from commit c48821df0310cfe6459dac50f0f71c68da89ecd4 at `c48821df03` * already include commit 7044e203820b44af90d2ca9bf9c5e1cde4f2df8a from `7044e20382`	2024-03-30 02:45:00 -04:00
tenplus1	a58be58676	update translation (thanks Niklp) * backported from notabug but the real PR was deleted cos tenplus1 need to be narcissist, petty backported commit 3ca3d656cb94836973814fc1ba49ab435319fcea from `3ca3d656cb` * backported the fix missing FS commit 33c78e87d0f73a32777bc855ff7db59f3c0989bf from `33c78e87d0`	2024-03-30 02:36:06 -04:00
general	05352a6c25	remove optional depends dye and farming only for 5.x * cos you know it, tenplus1 like being so narcissist, petty only him can figure it on a commit! backported `32231d5043`	2024-03-30 01:45:33 -04:00
general	c41176b807	tweak for mineclone and 5.x, backguard compat 0.4, intlib only for older * backported commit `131c932aa6` that will tweak detection of player api for mt5, mineclone2 and mt 0.4 * backported adapted `5e96602085`	2024-03-30 01:41:54 -04:00
mckaygerhard	a4cf246fce	autodetect ":" to beginning of entity registration and auto added if not present * improves the commit commit b1ad4451a7 that really helps to registered external mobs but this could break others already implemented.. i mean.. what happened if someone already add the ":" prefix? This commit addressed that! * this close https://notabug.org/TenPlus1/mobs_redo/issues/154 fixed in good way	2023-08-08 08:31:52 -04:00
mckaygerhard	a89c912829	add ":" to beginning of entity registration, but will possible break compatibility * this its explained at https://notabug.org/TenPlus1/mobs_redo/issues/154 so next commit will add a workaround that manages both cases * Merge branch 'master' of https://notabug.org/TenPlus1/mobs_redo into main	2023-08-08 08:21:10 -04:00
tenplus1	b1ad4451a7	add ":" to beginning of entity registration	2023-08-07 08:09:08 +01:00
mckaygerhard	a8f447a346	err its better the xclusive player check, minetest api is shit	2023-08-05 22:50:30 -04:00
mckaygerhard	49a5d903d4	tweak velocity changes, merge from upstream * Merge branch 'master' of https://notabug.org/TenPlus1/mobs_redo into main	2023-08-05 22:47:20 -04:00
tenplus1	af7eafc22c	tweak velocity changes	2023-08-05 18:10:06 +01:00