Merge remote-tracking branch 'upstream/master'

bee.lua

@@ -1,5 +1,5 @@
 
-local S = mobs.intllib
+local S = mobs.intllib_animal
 
 -- Bee by KrupnoPavel (.b3d model by sirrobzeroone)
 

bunny.lua

@@ -1,5 +1,5 @@
 
-local S = mobs.intllib
+local S = mobs.intllib_animal
 
 
 -- Bunny by ExeterDad

chicken.lua

@@ -1,5 +1,5 @@
 
-local S = mobs.intllib
+local S = mobs.intllib_animal
 
 
 -- Chicken by JK Murray and Sirrobzeroone

cow.lua

@@ -1,5 +1,5 @@
 
-local S = mobs.intllib
+local S = mobs.intllib_animal
 
 
 -- Cow by sirrobzeroone
@@ -19,7 +19,7 @@ mobs:register_mob("mobs_animal:cow", {
 	mesh = "mobs_cow.b3d",
 	textures = {
 		{"mobs_cow.png"},
-		{"mobs_cow2.png"},
+		{"mobs_cow2.png"}
 	},
 	makes_footstep_sound = true,
 	sounds = {
@@ -57,7 +57,7 @@ mobs:register_mob("mobs_animal:cow", {
 		die_start = 165,
 		die_end = 185,
 		die_speed = 10,
-		die_loop = false,
+		die_loop = false
 	},
 	follow = {
 		"farming:wheat", "default:grass_1", "farming:barley",
@@ -89,9 +89,11 @@ mobs:register_mob("mobs_animal:cow", {
 
 		local tool = clicker:get_wielded_item()
 		local name = clicker:get_player_name()
+		local item = tool:get_name()
 
 		-- milk cow with empty bucket
-		if tool:get_name() == "bucket:bucket_empty" then
+		if item == "bucket:bucket_empty"
+		or item == "wooden_bucket:bucket_wood_empty" then
 
 			--if self.gotten == true
 			if self.child == true then
@@ -109,12 +111,18 @@ mobs:register_mob("mobs_animal:cow", {
 			tool:take_item()
 			clicker:set_wielded_item(tool)
 
-			if inv:room_for_item("main", {name = "mobs:bucket_milk"}) then
-				clicker:get_inventory():add_item("main", "mobs:bucket_milk")
+			-- which bucket are we using
+			local ret_item = "mobs:bucket_milk"
+			if item == "wooden_bucket:bucket_wood_empty" then
+				ret_item = "mobs:wooden_bucket_milk"
+			end
+
+			if inv:room_for_item("main", {name = ret_item}) then
+				clicker:get_inventory():add_item("main", ret_item)
 			else
 				local pos = self.object:get_pos()
 				pos.y = pos.y + 0.5
-				minetest.add_item(pos, {name = "mobs:bucket_milk"})
+				minetest.add_item(pos, {name = ret_item})
 			end
 
 			self.gotten = true -- milked
@@ -132,7 +140,7 @@ mobs:register_mob("mobs_animal:cow", {
 			self.food = 0
 			self.gotten = false
 		end
-	end,
+	end
 })
 
 
@@ -143,10 +151,10 @@ mobs:spawn({
 	neighbors = {"group:grass"},
 	min_light = 14,
 	interval = 60,
-	chance = 8000, -- 15000
+	chance = 8000,
 	min_height = 5,
 	max_height = 200,
-	day_toggle = true,
+	day_toggle = true
 })
 end
 
@@ -175,18 +183,16 @@ minetest.register_craftitem(":mobs:glass_milk", {
 })
 
 minetest.register_craft({
---	type = "shapeless",
 	output = "mobs:glass_milk 4",
 	recipe = {
 		{"vessels:drinking_glass", "vessels:drinking_glass"},
 		{"vessels:drinking_glass", "vessels:drinking_glass"},
 		{"mobs:bucket_milk", ""}
 	},
-	replacements = { {"mobs:bucket_milk", "bucket:bucket_empty"} }
+	replacements = {{"mobs:bucket_milk", "bucket:bucket_empty"}}
 })
 
 minetest.register_craft({
---	type = "shapeless",
 	output = "mobs:bucket_milk",
 	recipe = {
 		{"group:food_milk_glass", "group:food_milk_glass"},
@@ -207,28 +213,24 @@ minetest.register_craftitem(":mobs:butter", {
 	groups = {food_butter = 1, flammable = 2}
 })
 
+local salt_item = "default:sapling" -- some saplings are high in sodium
+
 if minetest.get_modpath("farming") and farming and farming.mod then
-minetest.register_craft({
-	type = "shapeless",
-	output = "mobs:butter",
-	recipe = {"mobs:bucket_milk", "farming:salt"},
-	replacements = {{ "mobs:bucket_milk", "bucket:bucket_empty"}}
-})
-else -- some saplings are high in sodium so makes a good replacement item
-minetest.register_craft({
-	type = "shapeless",
-	output = "mobs:butter",
-	recipe = {"mobs:bucket_milk", "default:sapling"},
-	replacements = {{ "mobs:bucket_milk", "bucket:bucket_empty"}}
-})
+	salt_item = "farming:salt"
 end
 
+minetest.register_craft({
+	output = "mobs:butter",
+	recipe = {{"mobs:bucket_milk", salt_item}},
+	replacements = {{"mobs:bucket_milk", "bucket:bucket_empty"}}
+})
+
 -- cheese wedge
 minetest.register_craftitem(":mobs:cheese", {
 	description = S("Cheese"),
 	inventory_image = "mobs_cheese.png",
 	on_use = minetest.item_eat(4),
-	groups = {food_cheese = 1, flammable = 2},
+	groups = {food_cheese = 1, flammable = 2}
 })
 
 minetest.register_craft({
@@ -236,7 +238,7 @@ minetest.register_craft({
 	output = "mobs:cheese",
 	recipe = "mobs:bucket_milk",
 	cooktime = 5,
-	replacements = {{ "mobs:bucket_milk", "bucket:bucket_empty"}}
+	replacements = {{"mobs:bucket_milk", "bucket:bucket_empty"}}
 })
 
 -- cheese block
@@ -253,15 +255,13 @@ minetest.register_craft({
 	recipe = {
 		{"group:food_cheese", "group:food_cheese", "group:food_cheese"},
 		{"group:food_cheese", "group:food_cheese", "group:food_cheese"},
-		{"group:food_cheese", "group:food_cheese", "group:food_cheese"},
+		{"group:food_cheese", "group:food_cheese", "group:food_cheese"}
 	}
 })
 
 minetest.register_craft({
 	output = "mobs:cheese 9",
-	recipe = {
-		{"mobs:cheeseblock"},
-	}
+	recipe = {{"mobs:cheeseblock"}}
 })
 
 -- Dung (from factory's fertilizer)
@@ -292,3 +292,43 @@ minetest.register_craft({
 	recipe = "mobs:dung",
 	burntime = "8",
 })
+
+-- check for wooden bucket mod and add compatibility
+if minetest.get_modpath("wooden_bucket") then
+
+	minetest.register_craftitem(":mobs:wooden_bucket_milk", {
+		description = S("Wooden Bucket of Milk"),
+		inventory_image = "mobs_wooden_bucket_milk.png",
+		stack_max = 1,
+		on_use = minetest.item_eat(8, "wooden_bucket:bucket_wood_empty"),
+		groups = {food_milk = 1, flammable = 3, drink = 1}
+	})
+
+	minetest.register_craft({
+		output = "mobs:glass_milk 4",
+		recipe = {
+			{"vessels:drinking_glass", "vessels:drinking_glass"},
+			{"vessels:drinking_glass", "vessels:drinking_glass"},
+			{"mobs:wooden_bucket_milk", ""}
+		},
+		replacements = {{"mobs:wooden_bucket_milk", "wooden_bucket:bucket_wood_empty"}}
+	})
+
+	minetest.register_craft({
+		output = "mobs:wooden_bucket_milk",
+		recipe = {
+			{"group:food_milk_glass", "group:food_milk_glass"},
+			{"group:food_milk_glass", "group:food_milk_glass"},
+			{"wooden_bucket:bucket_wood_empty", ""}
+		},
+		replacements = {
+			{"group:food_milk_glass", "vessels:drinking_glass 4"}
+		}
+	})
+
+	minetest.register_craft({
+		output = "mobs:butter",
+		recipe = {{"mobs:wooden_bucket_milk", salt_item}},
+		replacements = {{"mobs:wooden_bucket_milk", "wooden_bucket:bucket_wood_empty"}}
+	})
+end

init.lua

@@ -1,11 +1,29 @@
-
--- Load support for intllib.
 local path = minetest.get_modpath(minetest.get_current_modname()) .. "/"
 
-local S = minetest.get_translator and minetest.get_translator("mobs_animal") or
-		dofile(path .. "intllib.lua")
+-- Check for translation method
+local S
+if minetest.get_translator ~= nil then
+	S = minetest.get_translator("mobs_animal") -- 5.x translation function
+else
+	if minetest.get_modpath("intllib") then
+		dofile(minetest.get_modpath("intllib") .. "/init.lua")
+		if intllib.make_gettext_pair then
+			gettext, ngettext = intllib.make_gettext_pair() -- new gettext method
+		else
+			gettext = intllib.Getter() -- old text file method
+		end
+		S = gettext
+	else -- boilerplate function
+		S = function(str, ...)
+			local args = {...}
+			return str:gsub("@%d+", function(match)
+				return args[tonumber(match:sub(2))]
+			end)
+		end
+	end
+end
 
-mobs.intllib = S
+mobs.intllib_animal = S
 
 
 -- Check for custom mob spawn file
@@ -41,4 +59,4 @@ end
 dofile(path .. "lucky_block.lua")
 
 
-print (S("[MOD] Mobs Redo Animals loaded"))
+print ("[MOD] Mobs Redo Animals loaded")

intllib.lua

@@ -1,3 +0,0 @@
--- Support for the old multi-load method
-dofile(minetest.get_modpath("intllib").."/init.lua")
-

kitten.lua

@@ -1,5 +1,5 @@
 
-local S = mobs.intllib
+local S = mobs.intllib_animal
 local hairball = minetest.settings:get("mobs_hairball")
 
 -- Kitten by Jordach / BFD
@@ -54,7 +54,7 @@ stepheight = 1.1,
 	},
 	follow = {
 		"mobs_animal:rat", "group:food_fish_raw",
-		"mobs_fish:tropical", "xocean:fish_edible",
+		"mobs_fish:tropical", "mobs_fish:clownfish", "xocean:fish_edible",
 		"group:fishraw" -- NALC: Group from fishing mod
 	},
 	view_range = 8,

locale/mobs_animal.es.tr

@@ -0,0 +1,46 @@
+# textdomain: mobs_animal
+Bee=Abeja
+Honey=Miel
+Beehive=Colmena
+Honey Block=Bloque de Mel
+Bunny=Conejo
+Raw Rabbit=Carne de Conejo
+Cooked Rabbit=Conejo Asado
+Rabbit Hide=Conejo oculto
+Chicken=Gallina
+Chicken Egg=Huevo de Gallina
+Fried Egg=Huevo Frito
+Raw Chicken=Gallina cruda
+Cooked Chicken=Gallina Asada
+Feather=Pluma
+Cow already milked!=Vaca ordeñada
+Cow=Vaca
+Bucket of Milk=Balde de leche
+Cheese=Queso
+Cheese Block=Bloque de queso
+[MOD] Mobs Redo 'Animals' loaded=[MOD] Mobs redo Animals cargado
+Kitten=Gato
+Penguin=Pinguino
+Rat=Raton
+Cooked Rat=Raton Asado
+Black=Negro
+Blue=Azul
+Brown=Marrom
+Cyan=Cian
+Dark Green=Verde Oscuro
+Dark Grey=Gris Oscuro
+Green=Verde
+Grey=Gris
+Magenta=Magenta
+Orange=Naranja
+Pink=Rosa
+Red=Rojo
+Violet=Violeta
+White=Blanco
+Yellow=Amarillo
+@1 Sheep=Oveja @1 
+Raw Mutton=Carnero crudo
+Cooked Mutton=Carnero Assado
+Warthog=Javali
+Raw Porkchop=Costilla de Jabali crudo
+Cooked Porkchop=Costilla de Javali Assada

panda.lua

@@ -1,6 +1,5 @@
 
-local S = mobs.intllib
-
+local S = mobs.intllib_animal
 
 -- Panda by AspireMint (CC BY-SA 3.0)
 

penguin.lua

@@ -1,6 +1,5 @@
 
-local S = mobs.intllib
-
+local S = mobs.intllib_animal
 
 -- Penguin by D00Med
 

rat.lua

@@ -1,6 +1,5 @@
 
-local S = mobs.intllib
-
+local S = mobs.intllib_animal
 
 -- Rat by PilzAdam (B3D model by sirrobzeroone)
 

sheep.lua

@@ -1,5 +1,5 @@
 
-local S = mobs.intllib
+local S = mobs.intllib_animal
 
 local all_colours = {
 	{"black",      S("Black"),      "#000000b0"},
@@ -16,7 +16,7 @@ local all_colours = {
 	{"red",        S("Red"),        "#ff0000a0"},
 	{"violet",     S("Violet"),     "#2000c970"},
 	{"white",      S("White"),      "#abababc0"},
-	{"yellow",     S("Yellow"),     "#e3ff0070"},
+	{"yellow",     S("Yellow"),     "#e3ff0070"}
 }
 
 
@@ -36,13 +36,13 @@ for _, col in ipairs(all_colours) do
 		visual = "mesh",
 		mesh = "mobs_sheep.b3d",
 		textures = {
-			{"mobs_sheep_base.png^(mobs_sheep_wool.png^[colorize:" .. col[3] .. ")"},
+			{"mobs_sheep_base.png^(mobs_sheep_wool.png^[colorize:" .. col[3] .. ")"}
 		},
 		gotten_texture = {"mobs_sheep_shaved.png"},
 		gotten_mesh = "mobs_sheep_shaved.b3d",
 		makes_footstep_sound = true,
 		sounds = {
-			random = "mobs_sheep",
+			random = "mobs_sheep"
 		},
 		walk_velocity = 1,
 		run_velocity = 2,
@@ -52,7 +52,7 @@ for _, col in ipairs(all_colours) do
 		pushable = true,
 		drops = {
 			{name = "mobs:mutton_raw", chance = 1, min = 1, max = 2},
-			{name = "wool:"..col[1], chance = 1, min = 1, max = 1},
+			{name = "wool:"..col[1], chance = 1, min = 1, max = 1}
 		},
 		water_damage = 0,
 		lava_damage = 5,
@@ -69,7 +69,7 @@ for _, col in ipairs(all_colours) do
 			die_end = 2, --   re-use 2 standing frames at a speed of 1 fps and
 			die_speed = 1, -- have mob rotate when dying.
 			die_loop = false,
-			die_rotate = true,
+			die_rotate = true
 		},
 		follow = {
 			"farming:wheat", "default:grass_1", "farming:barley",
@@ -110,7 +110,7 @@ for _, col in ipairs(all_colours) do
 
 					self.object:set_properties({
 						textures = {"mobs_sheep_base.png^(mobs_sheep_wool.png^[colorize:" .. col[3] .. ")"},
-						mesh = "mobs_sheep.b3d",
+						mesh = "mobs_sheep.b3d"
 					})
 				end
 
@@ -223,7 +223,7 @@ mobs:spawn({
 	chance = 8000, -- 15000
 	min_height = 0,
 	max_height = 200,
-	day_toggle = true,
+	day_toggle = true
 })
 end
 
@@ -235,7 +235,7 @@ minetest.register_craftitem(":mobs:mutton_raw", {
 	description = S("Raw Mutton"),
 	inventory_image = "mobs_mutton_raw.png",
 	on_use = minetest.item_eat(2),
-	groups = {food_meat_raw = 1, food_mutton_raw = 1, flammable = 2},
+	groups = {food_meat_raw = 1, food_mutton_raw = 1, flammable = 2}
 })
 
 -- cooked mutton
@@ -243,12 +243,12 @@ minetest.register_craftitem(":mobs:mutton_cooked", {
 	description = S("Cooked Mutton"),
 	inventory_image = "mobs_mutton_cooked.png",
 	on_use = minetest.item_eat(6),
-	groups = {food_meat = 1, food_mutton = 1, flammable = 2},
+	groups = {food_meat = 1, food_mutton = 1, flammable = 2}
 })
 
 minetest.register_craft({
 	type = "cooking",
 	output = "mobs:mutton_cooked",
 	recipe = "mobs:mutton_raw",
-	cooktime = 5,
+	cooktime = 5
 })

warthog.lua

@@ -1,6 +1,5 @@
 
-local S = mobs.intllib
-
+local S = mobs.intllib_animal
 
 -- Warthog originally by KrupnoPavel, B3D model by sirrobzeroone
 
@@ -21,12 +20,12 @@ mobs:register_mob("mobs_animal:pumba", {
 	visual = "mesh",
 	mesh = "mobs_pumba.b3d",
 	textures = {
-		{"mobs_pumba.png"},
+		{"mobs_pumba.png"}
 	},
 	makes_footstep_sound = true,
 	sounds = {
 		random = "mobs_pig",
-		attack = "mobs_pig_angry",
+		attack = "mobs_pig_angry"
 	},
 	walk_velocity = 2,
 	run_velocity = 3,
@@ -37,7 +36,7 @@ mobs:register_mob("mobs_animal:pumba", {
 	view_range = 10,
 	drops = {
 		{name = "mobs:pork_raw", chance = 1, min = 1, max = 3},
-	   {name = "maptools:silver_coin", chance = 10, min = 0, max = 1,},
+	   {name = "maptools:silver_coin", chance = 10, min = 0, max = 1}
 	},
 	water_damage = 0,
 	lava_damage = 5,
@@ -56,14 +55,14 @@ mobs:register_mob("mobs_animal:pumba", {
 		die_end = 2, --   re-use 2 standing frames at a speed of 1 fps and
 		die_speed = 1, -- have mob rotate when dying.
 		die_loop = false,
-		die_rotate = true,
+		die_rotate = true
 	},
 	on_rightclick = function(self, clicker)
 
 		if mobs:feed_tame(self, clicker, 8, true, true) then return end
 		if mobs:protect(self, clicker) then return end
 		if mobs:capture_mob(self, clicker, 0, 5, 50, false, nil) then return end
-	end,
+	end
 })
 
 local spawn_on = {"default:dirt_with_grass"}
@@ -89,7 +88,7 @@ mobs:spawn({
 	chance = 8000, -- 15000
 	min_height = 0,
 	max_height = 200,
-	day_toggle = true,
+	day_toggle = true
 })
 end
 
@@ -104,7 +103,7 @@ minetest.register_craftitem(":mobs:pork_raw", {
 	description = S("Raw Porkchop"),
 	inventory_image = "mobs_pork_raw.png",
 	on_use = minetest.item_eat(4),
-	groups = {food_meat_raw = 1, food_pork_raw = 1, flammable = 2},
+	groups = {food_meat_raw = 1, food_pork_raw = 1, flammable = 2}
 })
 
 -- cooked porkchop
@@ -112,12 +111,12 @@ minetest.register_craftitem(":mobs:pork_cooked", {
 	description = S("Cooked Porkchop"),
 	inventory_image = "mobs_pork_cooked.png",
 	on_use = minetest.item_eat(8),
-	groups = {food_meat = 1, food_pork = 1, flammable = 2},
+	groups = {food_meat = 1, food_pork = 1, flammable = 2}
 })
 
 minetest.register_craft({
 	type = "cooking",
 	output = "mobs:pork_cooked",
 	recipe = "mobs:pork_raw",
-	cooktime = 5,
+	cooktime = 5
 })