From 95c32cb4af2481dba67503de15bdde6e522e587d Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Mon, 21 Sep 2020 09:48:45 +0100 Subject: [PATCH 01/19] Added spawn.lua check for custom mob spawning with example file --- bee.lua | 2 + bunny.lua | 2 + chicken.lua | 3 + cow.lua | 2 + init.lua | 47 +++++++---- kitten.lua | 2 + panda.lua | 2 +- penguin.lua | 4 +- rat.lua | 2 + sheep.lua | 2 + spawn_example.lua | 195 ++++++++++++++++++++++++++++++++++++++++++++++ warthog.lua | 3 +- 12 files changed, 249 insertions(+), 17 deletions(-) create mode 100644 spawn_example.lua diff --git a/bee.lua b/bee.lua index c642a20..70e4d38 100644 --- a/bee.lua +++ b/bee.lua @@ -46,6 +46,7 @@ mobs:register_mob("mobs_animal:bee", { -- end, }) +if not mobs.custom_spawn_animal then mobs:spawn({ name = "mobs_animal:bee", nodes = {"group:flower"}, @@ -56,6 +57,7 @@ mobs:spawn({ max_height = 200, day_toggle = true, }) +end mobs:register_egg("mobs_animal:bee", S("Bee"), "mobs_bee_inv.png") diff --git a/bunny.lua b/bunny.lua index 32c33f8..3948003 100644 --- a/bunny.lua +++ b/bunny.lua @@ -113,6 +113,7 @@ if minetest.get_modpath("ethereal") then spawn_on = "ethereal:prairie_dirt" end +if not mobs.custom_spawn_animal then mobs:spawn({ name = "mobs_animal:bunny", nodes = {spawn_on}, @@ -124,6 +125,7 @@ mobs:spawn({ max_height = 200, day_toggle = true, }) +end mobs:register_egg("mobs_animal:bunny", S("Bunny"), "mobs_bunny_inv.png", 0) diff --git a/chicken.lua b/chicken.lua index 1f16c6b..dd2eb8c 100644 --- a/chicken.lua +++ b/chicken.lua @@ -100,6 +100,8 @@ if minetest.get_modpath("ethereal") then spawn_on = {"ethereal:bamboo_dirt", "ethereal:prairie_dirt"} end + +if not mobs.custom_spawn_animal then mobs:spawn({ name = "mobs_animal:chicken", nodes = spawn_on, @@ -111,6 +113,7 @@ mobs:spawn({ max_height = 200, day_toggle = true, }) +end mobs:register_egg("mobs_animal:chicken", S("Chicken"), "mobs_chicken_inv.png", 0) diff --git a/cow.lua b/cow.lua index f9a19fd..2ceb8ad 100644 --- a/cow.lua +++ b/cow.lua @@ -135,6 +135,7 @@ mobs:register_mob("mobs_animal:cow", { }) +if not mobs.custom_spawn_animal then mobs:spawn({ name = "mobs_animal:cow", nodes = {"default:dirt_with_grass", "ethereal:green_dirt"}, @@ -146,6 +147,7 @@ mobs:spawn({ max_height = 200, day_toggle = true, }) +end mobs:register_egg("mobs_animal:cow", S("Cow"), "mobs_cow_inv.png") diff --git a/init.lua b/init.lua index 241ad08..149897f 100644 --- a/init.lua +++ b/init.lua @@ -1,23 +1,44 @@ -- Load support for intllib. -local path = minetest.get_modpath(minetest.get_current_modname()) +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") + dofile(path .. "intllib.lua") + mobs.intllib = S + +-- Check for custom mob spawn file +local input = io.open(path .. "spawn.lua", "r") + +if input then + mobs.custom_spawn_animal = true + input:close() + input = nil +end + + -- Animals -dofile(path .. "/chicken.lua") -- JKmurray -dofile(path .. "/cow.lua") -- KrupnoPavel -dofile(path .. "/rat.lua") -- PilzAdam -dofile(path .. "/sheep.lua") -- PilzAdam -dofile(path .. "/warthog.lua") -- KrupnoPavel -dofile(path .. "/bee.lua") -- KrupnoPavel -dofile(path .. "/bunny.lua") -- ExeterDad -dofile(path .. "/kitten.lua") -- Jordach/BFD -dofile(path .. "/penguin.lua") -- D00Med -dofile(path .. "/panda.lua") -- AspireMint +dofile(path .. "chicken.lua") -- JKmurray +dofile(path .. "cow.lua") -- KrupnoPavel +dofile(path .. "rat.lua") -- PilzAdam +dofile(path .. "sheep.lua") -- PilzAdam +dofile(path .. "warthog.lua") -- KrupnoPavel +dofile(path .. "bee.lua") -- KrupnoPavel +dofile(path .. "bunny.lua") -- ExeterDad +dofile(path .. "kitten.lua") -- Jordach/BFD +dofile(path .. "penguin.lua") -- D00Med +dofile(path .. "panda.lua") -- AspireMint + + +-- Load custom spawning +if mobs.custom_spawn_animal then + dofile(path .. "spawn.lua") +end + -- Lucky Blocks -dofile(path .. "/lucky_block.lua") +dofile(path .. "lucky_block.lua") + print (S("[MOD] Mobs Redo Animals loaded")) diff --git a/kitten.lua b/kitten.lua index 123ef93..1f5233a 100644 --- a/kitten.lua +++ b/kitten.lua @@ -115,6 +115,7 @@ if minetest.get_modpath("ethereal") then spawn_on = "ethereal:grove_dirt" end +if not mobs.custom_spawn_animal then mobs:spawn({ name = "mobs_animal:kitten", nodes = {spawn_on}, @@ -126,6 +127,7 @@ mobs:spawn({ max_height = 50, day_toggle = true, }) +end mobs:register_egg("mobs_animal:kitten", S("Kitten"), "mobs_kitten_inv.png", 0) diff --git a/panda.lua b/panda.lua index c49fc3e..d008e57 100644 --- a/panda.lua +++ b/panda.lua @@ -68,7 +68,7 @@ stepheight = 0.6, end, }) -if minetest.get_modpath("ethereal") then +if minetest.get_modpath("ethereal") and not mobs.custom_spawn_animal then mobs:spawn({ name = "mobs_animal:panda", diff --git a/penguin.lua b/penguin.lua index 98f2156..5b26312 100644 --- a/penguin.lua +++ b/penguin.lua @@ -60,7 +60,7 @@ stepheight = 0.6, end, }) - +if not mobs.custom_spawn_animal then mobs:spawn({ name = "mobs_animal:penguin", nodes = {"default:snowblock"}, @@ -71,6 +71,6 @@ mobs:spawn({ max_height = 200, day_toggle = true, }) - +end mobs:register_egg("mobs_animal:penguin", S("Penguin"), "mobs_penguin_inv.png") diff --git a/rat.lua b/rat.lua index 562b394..930a985 100644 --- a/rat.lua +++ b/rat.lua @@ -67,6 +67,7 @@ local function rat_spawn(self, pos) self.health = 100 end +if not mobs.custom_spawn_animal then mobs:spawn({ name = "mobs_animal:rat", nodes = {"default:stone"}, @@ -77,6 +78,7 @@ mobs:spawn({ max_height = 0, -- on_spawn = rat_spawn, }) +end mobs:register_egg("mobs_animal:rat", S("Rat"), "mobs_rat_inv.png") diff --git a/sheep.lua b/sheep.lua index 027d4da..afc3742 100644 --- a/sheep.lua +++ b/sheep.lua @@ -207,6 +207,7 @@ mobs:register_egg("mobs_animal:sheep_"..col[1], S("@1 Sheep", col[2]), "wool_".. end +if not mobs.custom_spawn_animal then mobs:spawn({ name = "mobs_animal:sheep_white", nodes = {"default:dirt_with_grass", "ethereal:green_dirt"}, @@ -218,6 +219,7 @@ mobs:spawn({ max_height = 200, day_toggle = true, }) +end mobs:alias_mob("mobs:sheep", "mobs_animal:sheep_white") -- compatibility diff --git a/spawn_example.lua b/spawn_example.lua new file mode 100644 index 0000000..22814c1 --- /dev/null +++ b/spawn_example.lua @@ -0,0 +1,195 @@ + +--[[ Spawn Template, defaults to values shown if line not provided + +mobs:spawn({ + + name = "", + + - Name of mob, must be provided e.g. "mymod:my_mob" + + nodes = {"group:soil, "group:stone"}, + + - Nodes to spawn on top of. + + neighbors = {"air"}, + + - Nodes to spawn beside. + + min_light = 0, + + - Minimum light level. + + max_light = 15, + + - Maximum light level, 15 is sunlight only. + + interval = 30, + + - Spawn interval in seconds. + + chance = 5000, + + - Spawn chance, 1 in every 5000 nodes. + + active_object_count = 1, + + - Active mobs of this type in area. + + min_height = -31000, + + - Minimum height level. + + max_height = 31000, + + - Maximum height level. + + day_toggle = nil, + + - Daytime toggle, true to spawn during day, false for night, nil for both + + on_spawn = nil, + + - On spawn function to run when mob spawns in world + + on_map_load = nil, + + - On map load, when true mob only spawns in newly generated map areas +}) +]]-- + + +-- Bee + +mobs:spawn({ + name = "mobs_animal:bee", + nodes = {"group:flower"}, + min_light = 14, + interval = 60, + chance = 7000, + min_height = 3, + max_height = 200, + day_toggle = true, +}) + +-- Bunny + +mobs:spawn({ + name = "mobs_animal:bunny", + nodes = {"default:dirt_with_grass"}, + neighbors = {"group:grass"}, + min_light = 14, + interval = 60, + chance = 8000, + min_height = 5, + max_height = 200, + day_toggle = true, +}) + +-- Chicken + +mobs:spawn({ + name = "mobs_animal:chicken", + nodes = {"default:dirt_with_grass"}, + neighbors = {"group:grass"}, + min_light = 14, + interval = 60, + chance = 8000, + min_height = 5, + max_height = 200, + day_toggle = true, +}) + +-- Cow + +mobs:spawn({ + name = "mobs_animal:cow", + nodes = {"default:dirt_with_grass", "ethereal:green_dirt"}, + neighbors = {"group:grass"}, + min_light = 14, + interval = 60, + chance = 8000, + min_height = 5, + max_height = 200, + day_toggle = true, +}) + +-- Kitten + +mobs:spawn({ + name = "mobs_animal:kitten", + nodes = {"default:dirt_with_grass"}, + neighbors = {"group:grass"}, + min_light = 14, + interval = 60, + chance = 10000, + min_height = 5, + max_height = 50, + day_toggle = true, +}) + +-- Panda + +mobs:spawn({ + name = "mobs_animal:panda", + nodes = {"ethereal:bamboo_dirt"}, + neighbors = {"group:grass"}, + min_light = 14, + interval = 60, + chance = 8000, + min_height = 10, + max_height = 80, + day_toggle = true, +}) + +-- Penguin + +mobs:spawn({ + name = "mobs_animal:penguin", + nodes = {"default:snowblock"}, + min_light = 14, + interval = 60, + chance = 20000, + min_height = 0, + max_height = 200, + day_toggle = true, +}) + +-- Rat + +mobs:spawn({ + name = "mobs_animal:rat", + nodes = {"default:stone"}, + min_light = 3, + max_light = 9, + interval = 60, + chance = 8000, + max_height = 0, +}) + +-- Sheep + +mobs:spawn({ + name = "mobs_animal:sheep_white", + nodes = {"default:dirt_with_grass", "ethereal:green_dirt"}, + neighbors = {"group:grass"}, + min_light = 14, + interval = 60, + chance = 8000, + min_height = 0, + max_height = 200, + day_toggle = true, +}) + +-- Warthog + +mobs:spawn({ + name = "mobs_animal:pumba", + nodes = {"default:dirt_with_dry_grass", "default:dry_dirt_with_dry_grass"}, + neighbors = {"group:dry_grass"}, + min_light = 14, + interval = 60, + chance = 8000, + min_height = 0, + max_height = 200, + day_toggle = true, +}) diff --git a/warthog.lua b/warthog.lua index 9405620..4c56d5b 100644 --- a/warthog.lua +++ b/warthog.lua @@ -72,6 +72,7 @@ if minetest.get_modpath("ethereal") then spawn_by = {"flowers:mushroom_brown", "flowers:mushroom_red"} end +if not mobs.custom_spawn_animal then mobs:spawn({ name = "mobs_animal:pumba", nodes = spawn_on, @@ -83,7 +84,7 @@ mobs:spawn({ max_height = 200, day_toggle = true, }) - +end mobs:register_egg("mobs_animal:pumba", S("Warthog"), "mobs_pumba_inv.png") From 96f41785b5c4ffdeb74b0fdb23b723221b8a9788 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 6 Dec 2020 08:57:16 +0000 Subject: [PATCH 02/19] add death spin to sheep when killed --- sheep.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sheep.lua b/sheep.lua index afc3742..31daab1 100644 --- a/sheep.lua +++ b/sheep.lua @@ -64,6 +64,12 @@ for _, col in ipairs(all_colours) do stand_end = 80, walk_start = 81, walk_end = 100, + + die_start = 1, -- we dont have a specific death animation so we will + 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, }, follow = { "farming:wheat", "default:grass_1", "farming:barley", @@ -97,7 +103,7 @@ for _, col in ipairs(all_colours) do --are we feeding? if mobs:feed_tame(self, clicker, 8, true, true) then - --if fed 7x grass or wheat then sheep regrows wool + --if fed 7 times then sheep regrows wool if self.food and self.food > 6 then self.gotten = false From 9c7e537f5235c22af26e37489fedd2e9f41b8a27 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Fri, 8 Jan 2021 10:15:40 +0000 Subject: [PATCH 03/19] hogs spin on death --- warthog.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/warthog.lua b/warthog.lua index 4c56d5b..f28f744 100644 --- a/warthog.lua +++ b/warthog.lua @@ -50,6 +50,12 @@ mobs:register_mob("mobs_animal:pumba", { walk_end = 100, punch_start = 70, punch_end = 100, + + die_start = 1, -- we dont have a specific death animation so we will + 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, }, on_rightclick = function(self, clicker) From 6a74a0583650ed041841e1ed0cf64a24faaaa509 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Wed, 13 Jan 2021 10:36:35 +0000 Subject: [PATCH 04/19] update milk bucket recipe to use soy milk (for vegan cheese) --- cow.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cow.lua b/cow.lua index 2ceb8ad..f92afc5 100644 --- a/cow.lua +++ b/cow.lua @@ -188,11 +188,13 @@ minetest.register_craft({ type = "shapeless", output = "mobs:bucket_milk", recipe = { - "mobs:glass_milk", "mobs:glass_milk", - "mobs:glass_milk", "mobs:glass_milk", + "group:food_milk_glass", "group:food_milk_glass", + "group:food_milk_glass", "group:food_milk_glass", "bucket:bucket_empty" }, - replacements = { {"mobs:glass_milk", "vessels:drinking_glass 4"} } + replacements = { + {"group:food_milk_glass", "vessels:drinking_glass 4"}, + } }) From 7de71d8724171cb1d0514e01aef6c37b18222c7c Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Thu, 14 Jan 2021 21:12:30 +0000 Subject: [PATCH 05/19] add compatibility groups to mob items --- bunny.lua | 2 +- chicken.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bunny.lua b/bunny.lua index 3948003..dd63ad7 100644 --- a/bunny.lua +++ b/bunny.lua @@ -161,7 +161,7 @@ minetest.register_craft({ minetest.register_craftitem(":mobs:rabbit_hide", { description = S("Rabbit Hide"), inventory_image = "mobs_rabbit_hide.png", - groups = {flammable = 2}, + groups = {flammable = 2, leather = 1}, }) minetest.register_craft({ diff --git a/chicken.lua b/chicken.lua index dd2eb8c..ad55240 100644 --- a/chicken.lua +++ b/chicken.lua @@ -302,7 +302,7 @@ minetest.register_craft({ minetest.register_craftitem(":mobs:chicken_feather", { description = S("Feather"), inventory_image = "mobs_chicken_feather.png", - groups = {flammable = 2}, + groups = {flammable = 2, feather = 1}, }) minetest.register_craft({ From c22c556b5f03cbf94ec18f17bb150333a634a250 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Mon, 18 Jan 2021 11:00:54 +0000 Subject: [PATCH 06/19] change rabbit hide to pelt group instead of leather --- bunny.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bunny.lua b/bunny.lua index dd63ad7..fd972ac 100644 --- a/bunny.lua +++ b/bunny.lua @@ -161,7 +161,7 @@ minetest.register_craft({ minetest.register_craftitem(":mobs:rabbit_hide", { description = S("Rabbit Hide"), inventory_image = "mobs_rabbit_hide.png", - groups = {flammable = 2, leather = 1}, + groups = {flammable = 2, pelt = 1}, }) minetest.register_craft({ From 77ed774de5a115b14a2bb086817054a9222e92d0 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Thu, 21 Jan 2021 10:14:06 +0000 Subject: [PATCH 07/19] update mod.conf info --- mod.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mod.conf b/mod.conf index e2080bc..2cc6715 100644 --- a/mod.conf +++ b/mod.conf @@ -1 +1,4 @@ name = mobs_animal +depends = default, mobs +optional_depends = lucky_block, intllib +description = Adds farm animals. From a1bbcb26ec74e14a76d4790a4bdf13e8fcf6d6b5 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Fri, 29 Jan 2021 20:32:41 +0000 Subject: [PATCH 08/19] amend cheese block recipe and dig groups --- cow.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cow.lua b/cow.lua index f92afc5..0fac747 100644 --- a/cow.lua +++ b/cow.lua @@ -243,16 +243,16 @@ minetest.register_node(":mobs:cheeseblock", { description = S("Cheese Block"), tiles = {"mobs_cheeseblock.png"}, is_ground_content = false, - groups = {crumbly = 3}, + groups = {oddly_breakable_by_hand = 3}, sounds = default.node_sound_dirt_defaults() }) minetest.register_craft({ output = "mobs:cheeseblock", recipe = { - {"mobs:cheese", "mobs:cheese", "mobs:cheese"}, - {"mobs:cheese", "mobs:cheese", "mobs:cheese"}, - {"mobs:cheese", "mobs:cheese", "mobs: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"}, } }) From 8bfa17719089cbce969ffa8140b6d951fa4c8abf Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Mon, 8 Feb 2021 20:27:14 +0000 Subject: [PATCH 09/19] nil check for egg drop --- chicken.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chicken.lua b/chicken.lua index ad55240..2c3b448 100644 --- a/chicken.lua +++ b/chicken.lua @@ -81,7 +81,7 @@ stepheight = 0.6, return end - local pos = self.object:get_pos() + local pos = self.object:get_pos() ; if not pos then return end minetest.add_item(pos, "mobs:egg") From 733ab61820067ba6b158ab612b172dc20de5ef4b Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Tue, 23 Mar 2021 16:38:48 +0000 Subject: [PATCH 10/19] update fish kittens like --- kitten.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kitten.lua b/kitten.lua index 1f5233a..dc20213 100644 --- a/kitten.lua +++ b/kitten.lua @@ -53,7 +53,11 @@ stepheight = 1.1, stoodup_end = 0, }, follow = { - "mobs_animal:rat", "ethereal:fish_raw", "mobs_fish:clownfish", + "mobs:rat", "ethereal:fish_bluefin", "ethereal:fish_blueram", + "ethereal:fish_catfish", "ethereal:fish_plaice", "ethereal:fish_salmon", + "ethereal:fish_clownfish", "ethereal:fish_pike", "ethereal:fish_flathead", + "ethereal:fish_chichlid", "ethereal:fish_coy", "ethereal:fish_angler", + "ethereal:fish_piranha", "ethereal:fish_trout", "mobs_fish:tropical", "xocean:fish_edible" }, view_range = 8, From db59194f8884ee2155e2a2933833879b4065816b Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Tue, 23 Mar 2021 17:08:15 +0000 Subject: [PATCH 11/19] use group:food_fish_raw instead of huge list of fish --- kitten.lua | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/kitten.lua b/kitten.lua index dc20213..04aa6f0 100644 --- a/kitten.lua +++ b/kitten.lua @@ -53,12 +53,7 @@ stepheight = 1.1, stoodup_end = 0, }, follow = { - "mobs:rat", "ethereal:fish_bluefin", "ethereal:fish_blueram", - "ethereal:fish_catfish", "ethereal:fish_plaice", "ethereal:fish_salmon", - "ethereal:fish_clownfish", "ethereal:fish_pike", "ethereal:fish_flathead", - "ethereal:fish_chichlid", "ethereal:fish_coy", "ethereal:fish_angler", - "ethereal:fish_piranha", "ethereal:fish_trout", - "mobs_fish:tropical", "xocean:fish_edible" + "mobs:rat", "group:food_fish_raw", "mobs_fish:tropical", "xocean:fish_edible" }, view_range = 8, From f2b1b752a78406bf5c7a02a4d2c80bda281069b9 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Tue, 23 Mar 2021 19:14:37 +0000 Subject: [PATCH 12/19] update penguin to use group:food_fish_raw for taming --- penguin.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/penguin.lua b/penguin.lua index 5b26312..f4b04ee 100644 --- a/penguin.lua +++ b/penguin.lua @@ -46,7 +46,7 @@ stepheight = 0.6, fly_in = {"default:water_source", "default:water_flowing"}, floats = 0, follow = { - "ethereal:fish_raw", "mobs_fish:clownfish", "mobs_fish:tropical", + "group:food_fish_raw", "mobs_fish:clownfish", "mobs_fish:tropical", "mobs_fish:clownfish_set", "mobs_fish:tropical_set", "xocean:fish_edible" }, view_range = 5, From 54f6de148b218a5d652260e3feb9a61fdd153b69 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Fri, 2 Apr 2021 14:01:14 +0100 Subject: [PATCH 13/19] check item exists for hairballs --- kitten.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kitten.lua b/kitten.lua index 04aa6f0..5809451 100644 --- a/kitten.lua +++ b/kitten.lua @@ -155,7 +155,8 @@ minetest.register_craftitem(":mobs:hairball", { local newpos = {x = pos.x + dir.x, y = pos.y + dir.y + 1.5, z = pos.z + dir.z} local item = hairball_items[math.random(1, #hairball_items)] - if item ~= "" then + if item ~= "" + and minetest.registered_items[item] then minetest.add_item(newpos, {name = item}) end From cd2b2609a2b93d64229060e83e13b6be9d39de8f Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Tue, 6 Apr 2021 13:07:55 +0100 Subject: [PATCH 14/19] add _is_arrow=true to throwable egg --- chicken.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/chicken.lua b/chicken.lua index 2c3b448..e5d82c4 100644 --- a/chicken.lua +++ b/chicken.lua @@ -138,7 +138,7 @@ mobs:register_arrow("mobs_animal:egg_entity", { end, hit_mob = function(self, player) - player:punch(minetest.get_player_by_name(self.playername) or self.object, 1.0, { + player:punch(self.object, 1.0, { full_punch_interval = 1.0, damage_groups = {fleshy = 1}, }, nil) @@ -213,6 +213,7 @@ local mobs_shoot_egg = function (item, player, pointed_thing) ent.velocity = egg_VELOCITY -- needed for api internal timing ent.switch = 1 -- needed so that egg doesn't despawn straight away + ent._is_arrow = true -- tell advanced mob protection this is an arrow obj:setvelocity({ x = dir.x * egg_VELOCITY, From 80e72a4edce6b0393a0cdf48f5d06312c99d7133 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Tue, 13 Apr 2021 21:13:35 +0100 Subject: [PATCH 15/19] reduce shapeless crafts --- bunny.lua | 6 +++--- cow.lua | 20 ++++++++++---------- rat.lua | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/bunny.lua b/bunny.lua index fd972ac..aaff560 100644 --- a/bunny.lua +++ b/bunny.lua @@ -172,9 +172,9 @@ minetest.register_craft({ minetest.register_craft({ output = "mobs:leather", - type = "shapeless", +-- type = "shapeless", recipe = { - "mobs:rabbit_hide", "mobs:rabbit_hide", - "mobs:rabbit_hide", "mobs:rabbit_hide" + {"mobs:rabbit_hide", "mobs:rabbit_hide"}, + {"mobs:rabbit_hide", "mobs:rabbit_hide"} } }) diff --git a/cow.lua b/cow.lua index 0fac747..bcb75f6 100644 --- a/cow.lua +++ b/cow.lua @@ -174,26 +174,26 @@ minetest.register_craftitem(":mobs:glass_milk", { }) minetest.register_craft({ - type = "shapeless", +-- type = "shapeless", output = "mobs:glass_milk 4", recipe = { - "vessels:drinking_glass", "vessels:drinking_glass", - "vessels:drinking_glass", "vessels:drinking_glass", - "mobs:bucket_milk" + {"vessels:drinking_glass", "vessels:drinking_glass"}, + {"vessels:drinking_glass", "vessels:drinking_glass"}, + {"mobs:bucket_milk", ""} }, replacements = { {"mobs:bucket_milk", "bucket:bucket_empty"} } }) minetest.register_craft({ - type = "shapeless", +-- type = "shapeless", output = "mobs:bucket_milk", recipe = { - "group:food_milk_glass", "group:food_milk_glass", - "group:food_milk_glass", "group:food_milk_glass", - "bucket:bucket_empty" + {"group:food_milk_glass", "group:food_milk_glass"}, + {"group:food_milk_glass", "group:food_milk_glass"}, + {"bucket:bucket_empty", ""} }, replacements = { - {"group:food_milk_glass", "vessels:drinking_glass 4"}, + {"group:food_milk_glass", "vessels:drinking_glass 4"} } }) @@ -203,7 +203,7 @@ minetest.register_craftitem(":mobs:butter", { description = S("Butter"), inventory_image = "mobs_butter.png", on_use = minetest.item_eat(1), - groups = {food_butter = 1, flammable = 2}, + groups = {food_butter = 1, flammable = 2} }) if minetest.get_modpath("farming") and farming and farming.mod then diff --git a/rat.lua b/rat.lua index 930a985..ee73d47 100644 --- a/rat.lua +++ b/rat.lua @@ -92,12 +92,12 @@ minetest.register_craftitem(":mobs:rat_cooked", { description = S("Cooked Rat"), inventory_image = "mobs_cooked_rat.png", on_use = minetest.item_eat(3), - groups = {food_rat = 1, flammable = 2}, + groups = {food_rat = 1, flammable = 2} }) minetest.register_craft({ type = "cooking", output = "mobs:rat_cooked", recipe = "mobs_animal:rat", - cooktime = 5, + cooktime = 5 }) From 1d50cdbccad4237dd9b8e456708090ae40330b5a Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sat, 15 May 2021 09:39:43 +0100 Subject: [PATCH 16/19] fix kitten tamed with rats --- kitten.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kitten.lua b/kitten.lua index 5809451..2b4c876 100644 --- a/kitten.lua +++ b/kitten.lua @@ -53,7 +53,8 @@ stepheight = 1.1, stoodup_end = 0, }, follow = { - "mobs:rat", "group:food_fish_raw", "mobs_fish:tropical", "xocean:fish_edible" + "mobs_animal:rat", "group:food_fish_raw", + "mobs_fish:tropical", "xocean:fish_edible" }, view_range = 8, From 52d4d450275dfb1a60af697ad2d20a7d117cce6e Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Tue, 18 May 2021 19:08:06 +0100 Subject: [PATCH 17/19] dont drop 8x buckets of milk as stack, separate with water buckets --- lucky_block.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lucky_block.lua b/lucky_block.lua index e88b20d..e2b028c 100644 --- a/lucky_block.lua +++ b/lucky_block.lua @@ -12,7 +12,7 @@ if minetest.get_modpath("lucky_block") then {"spw", "mobs:chicken", 5}, {"dro", {"mobs:egg"}, 5}, {"spw", "mobs:cow", 5}, - {"dro", {"mobs:bucket_milk"}, 8}, + {"dro", {"mobs:bucket_milk", "bucket:bucket_water"}, 8}, {"spw", "mobs:kitten", 2}, {"exp"}, {"dro", {"mobs:hairball"}, 3}, From 9a27ed80d7d71cdc26527b98b7d390a90ad76d4c Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Mon, 21 Jun 2021 11:07:39 +0100 Subject: [PATCH 18/19] add Brazilian Portuguese translations and converter (thanks Lunovox) --- locale/README.md | 10 ++ locale/mobs_animal.pt.tr | 46 +++++++++ locale/mobs_animal.pt_BR.tr | 46 +++++++++ locale/po2tr.lua | 116 +++++++++++++++++++++ locale/pt.po | 199 ++++++++++++++++++++++++++++++++++++ locale/pt.txt | 46 +++++++++ locale/pt_BR.po | 199 ++++++++++++++++++++++++++++++++++++ locale/pt_BR.txt | 46 +++++++++ 8 files changed, 708 insertions(+) create mode 100644 locale/README.md create mode 100644 locale/mobs_animal.pt.tr create mode 100644 locale/mobs_animal.pt_BR.tr create mode 100644 locale/po2tr.lua create mode 100644 locale/pt.po create mode 100644 locale/pt.txt create mode 100644 locale/pt_BR.po create mode 100644 locale/pt_BR.txt diff --git a/locale/README.md b/locale/README.md new file mode 100644 index 0000000..4887b9e --- /dev/null +++ b/locale/README.md @@ -0,0 +1,10 @@ +# Convert '.po' file to '.txt' file. + +### COMMAND SAMPLE +'''' +$ lua po2tr.lua "Your Name (Your Site) " "pt_BR.po" +rm "pt_BR.tr" "mobs_animal.pt_BR.tr" +$ cat mobs_animal.pt_BR.tr | less +'''' + +Source Code: https://gitlab.com/4w/xtend/-/blob/master/xtend_default/tools/convert_po_file_to_tr_file/convert_po_file_to_tr_file.lua diff --git a/locale/mobs_animal.pt.tr b/locale/mobs_animal.pt.tr new file mode 100644 index 0000000..60d9f5c --- /dev/null +++ b/locale/mobs_animal.pt.tr @@ -0,0 +1,46 @@ +# textdomain: Lunovox Heavenfinder (https://libreplanet.org/wiki/User:Lunovox) +Bee=Abelha +Honey=Mel +Beehive=Colméia +Honey Block=Bloco de Mel +Bunny=Coelho +Raw Rabbit=Carne de Coelho (Cru) +Cooked Rabbit=Coelho (Assado) +Rabbit Hide=Pele de Coelho +Chicken=Galinha +Chicken Egg=Ovo de Galinha +Fried Egg=Ovo Frito +Raw Chicken=Carne de Galinha (Crua) +Cooked Chicken=Galinha Assada +Feather=Pluma +Cow already milked!=Vaca já ordenhada! +Cow=Vaca +Bucket of Milk=Balde de leite +Cheese=Queijo +Cheese Block=Bloco de Queijo +[MOD] Mobs Redo 'Animals' loaded=[MOBS_ANIMAL] Mod carregado completamente +Kitten=Gato +Penguin=Pinguim +Rat=Rato +Cooked Rat=Rato (Assado) +Black=Preto +Blue=Azul +Brown=Marrom +Cyan=Ciano +Dark Green=Verde Escuro +Dark Grey=Cinza Escuro +Green=Verde +Grey=Cinza +Magenta=Rosa Magenta +Orange=Laranja +Pink=Rosa +Red=Vermelho +Violet=Violeta +White=Branco +Yellow=Amarelo +@1 Sheep=Ovelha @1 +Raw Mutton=Carneiro (Cru) +Cooked Mutton=Carneiro (Assado) +Warthog=Javali +Raw Porkchop=Costeleta de Javali (Crua) +Cooked Porkchop=Costeleta de Javali Assada diff --git a/locale/mobs_animal.pt_BR.tr b/locale/mobs_animal.pt_BR.tr new file mode 100644 index 0000000..60d9f5c --- /dev/null +++ b/locale/mobs_animal.pt_BR.tr @@ -0,0 +1,46 @@ +# textdomain: Lunovox Heavenfinder (https://libreplanet.org/wiki/User:Lunovox) +Bee=Abelha +Honey=Mel +Beehive=Colméia +Honey Block=Bloco de Mel +Bunny=Coelho +Raw Rabbit=Carne de Coelho (Cru) +Cooked Rabbit=Coelho (Assado) +Rabbit Hide=Pele de Coelho +Chicken=Galinha +Chicken Egg=Ovo de Galinha +Fried Egg=Ovo Frito +Raw Chicken=Carne de Galinha (Crua) +Cooked Chicken=Galinha Assada +Feather=Pluma +Cow already milked!=Vaca já ordenhada! +Cow=Vaca +Bucket of Milk=Balde de leite +Cheese=Queijo +Cheese Block=Bloco de Queijo +[MOD] Mobs Redo 'Animals' loaded=[MOBS_ANIMAL] Mod carregado completamente +Kitten=Gato +Penguin=Pinguim +Rat=Rato +Cooked Rat=Rato (Assado) +Black=Preto +Blue=Azul +Brown=Marrom +Cyan=Ciano +Dark Green=Verde Escuro +Dark Grey=Cinza Escuro +Green=Verde +Grey=Cinza +Magenta=Rosa Magenta +Orange=Laranja +Pink=Rosa +Red=Vermelho +Violet=Violeta +White=Branco +Yellow=Amarelo +@1 Sheep=Ovelha @1 +Raw Mutton=Carneiro (Cru) +Cooked Mutton=Carneiro (Assado) +Warthog=Javali +Raw Porkchop=Costeleta de Javali (Crua) +Cooked Porkchop=Costeleta de Javali Assada diff --git a/locale/po2tr.lua b/locale/po2tr.lua new file mode 100644 index 0000000..b48ea07 --- /dev/null +++ b/locale/po2tr.lua @@ -0,0 +1,116 @@ +#!/usr/bin/env luajit + +-- Convert regular Gettext PO files to Minetest-specific TR files. If there is +-- already a TR file with the same name of the PO file except the file suffix +-- bneing .tr (or .TR) instead of .po (or .PO) then THIS FILE WILL BE +-- OVERWRITTEN WITHOUT INFORMATION OR A WAY TO RECOVER THE PREVIOUS FILE! +-- +-- +-- ▄██▄ +-- ▀███ +-- █ +-- ▄▄▄▄▄ █ +-- ▀▄ ▀▄ █ BACKUP +-- ▄▀▀▀▄ █▄▄▄▄█▄▄ ▄▀▀▀▄ █ +-- █ ▄ █ █ ▄ █ █ +-- ▀▄ ▄▀ ▀▄ ▄▀ █ +-- █▀▀▀ ▀▀▀ █ █ +-- █ █ █ ALL +-- ▄▀▄▄▀▄ █ ▄█▀█▀█▀█▀█▀█▄ █ █ +-- █▒▒▒▒█ █ █████████████▄ █ █ +-- █▒▒▒▒█ █ ██████████████▄ █ █ +-- █▒▒▒▒█ █ ██████████████▄ █ █ +-- █▒▒▒▒█ █ ██████████████ █ █ +-- █▒▒▒▒█ █ ██████████████▀ █ █ THE +-- █▒▒▒▒█ ██ ██████████████ █ █ +-- ▀████▀ ██▀█ █████████████▀ █▄█ +-- ██ ██ ▀█ █▄█▄█▄█▄█▄█▀ ▄█▀ +-- ██ ██ ▀█ ▄▀▓█ +-- ██ ██ ▀█▀▄▄▄▄▄▄▄▄▄▀▀▓▓▓█ +-- ████ █▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓█ +-- ███ █▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓█ THINGS +-- ██ █▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓█ +-- ██ █▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓█ +-- ██ ▐█▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓█ +-- ██ ▐█▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓█ +-- ██ ▐█▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓█▌ !!! +-- ██ ▐█▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓█▌ +-- ██ ▐█▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓█▌ +-- ██ ▐█▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓█▌ +-- +-- +-- The syntax of TR files according to the introducing forum post is: +-- +-- # textdomain: namespace +-- original 1 = translation 1 +-- original 2 = translation 2 +-- original 3 = tralslation 3 +-- original N = translation N +-- +-- Where namespace should be the name of the mod. Following strings have to be +-- escaped using @. +-- +-- String | Escape +-- -------+-------- +-- `@` |`@@` +-- `=` |`@=` +-- `\n` |`@\n` +-- +-- See https://forum.minetest.net/viewtopic.php?t=18349 for details. + + +-- Preparation +if arg[1] == nil or arg[2] == nil then + print('Provide the namesspace as first parameter') + print('Provide the path to the source PO file as second parameter') + print('Example: '..arg[0]..' mymod path/to/my/source.po') + return +end +local SEP = package.path:match('(%p)%?%.') or '/' -- wonky but hey ... :) + + +-- Assign parameters to local variables +local namespace = arg[1] +local po_file = arg[2] +local tr_file = arg[2]:gsub('po$', 'tr'):gsub('PO$', 'TR') + + +-- Get the translations through crude plaintext file parsing +local file_contents = {} +local translations = {} + +local po_file_handle = io.open(po_file, 'rb') +if po_file_handle == nil then print('No base file found') return end + +for line in po_file_handle:lines() do + if line:match('^msgid') or line:match('^msgstr') then + table.insert(file_contents, line) + end +end + +local escape_string = function (s) + s = s:gsub('@([^%d])', '@@%1') -- All @ not followed by a number become @@ + s = s:gsub('([^@]@)$', '%1@') -- An @ at the end of the string become @@ + s = s:gsub('=', '@=') -- All = become @= + return s +end + +for number,line_content in pairs(file_contents) do + if line_content:match('^msgid') then + local o = line_content:gsub('^msgid "(.+)"$', '%1') + local t = file_contents[number + 1]:gsub('^msgstr "(.+)"$', '%1') + if o ~= 'msgid = ""' and t ~= 'msgstr ""' then + table.insert(translations, escape_string(o)..'='..escape_string(t)) + end + end +end +print(number) +po_file_handle:close() + + +-- Write translation to file +local tr_file_handle = io.open(tr_file, 'w+') +if tr_file_handle == nil then print('Could not open target file') return end +tr_file_handle:write('# textdomain: '..namespace, "\n") +for _,line in pairs(translations) do tr_file_handle:write(line, "\n") end +tr_file_handle:close() diff --git a/locale/pt.po b/locale/pt.po new file mode 100644 index 0000000..20f09d6 --- /dev/null +++ b/locale/pt.po @@ -0,0 +1,199 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-31 11:28+0200\n" +"PO-Revision-Date: 2021-06-20 18:51-0300\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.0.6\n" +"Last-Translator: Lunovox Heavenfinder \n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Language: pt_BR\n" + +#: bee.lua +msgid "Bee" +msgstr "Abelha" + +#: bee.lua +msgid "Honey" +msgstr "Mel" + +#: bee.lua +msgid "Beehive" +msgstr "Colméia" + +#: bee.lua +msgid "Honey Block" +msgstr "Bloco de Mel" + +#: bunny.lua +msgid "Bunny" +msgstr "Coelho" + +#: bunny.lua +msgid "Raw Rabbit" +msgstr "Carne de Coelho (Cru)" + +#: bunny.lua +msgid "Cooked Rabbit" +msgstr "Coelho (Assado)" + +#: bunny.lua +msgid "Rabbit Hide" +msgstr "Pele de Coelho" + +#: chicken.lua +msgid "Chicken" +msgstr "Galinha" + +#: chicken.lua +msgid "Chicken Egg" +msgstr "Ovo de Galinha" + +#: chicken.lua +msgid "Fried Egg" +msgstr "Ovo Frito" + +#: chicken.lua +msgid "Raw Chicken" +msgstr "Carne de Galinha (Crua)" + +#: chicken.lua +msgid "Cooked Chicken" +msgstr "Galinha Assada" + +#: chicken.lua +msgid "Feather" +msgstr "Pluma" + +#: cow.lua +msgid "Cow already milked!" +msgstr "Vaca já ordenhada!" + +#: cow.lua +msgid "Cow" +msgstr "Vaca" + +#: cow.lua +msgid "Bucket of Milk" +msgstr "Balde de leite" + +#: cow.lua +msgid "Cheese" +msgstr "Queijo" + +#: cow.lua +msgid "Cheese Block" +msgstr "Bloco de Queijo" + +#: init.lua +msgid "[MOD] Mobs Redo 'Animals' loaded" +msgstr "[MOBS_ANIMAL] Mod carregado completamente" + +#: kitten.lua +msgid "Kitten" +msgstr "Gato" + +#: penguin.lua +msgid "Penguin" +msgstr "Pinguim" + +#: rat.lua +msgid "Rat" +msgstr "Rato" + +#: rat.lua +msgid "Cooked Rat" +msgstr "Rato (Assado)" + +#: sheep.lua +msgid "Black" +msgstr "Preto" + +#: sheep.lua +msgid "Blue" +msgstr "Azul" + +#: sheep.lua +msgid "Brown" +msgstr "Marrom" + +#: sheep.lua +msgid "Cyan" +msgstr "Ciano" + +#: sheep.lua +msgid "Dark Green" +msgstr "Verde Escuro" + +#: sheep.lua +msgid "Dark Grey" +msgstr "Cinza Escuro" + +#: sheep.lua +msgid "Green" +msgstr "Verde" + +#: sheep.lua +msgid "Grey" +msgstr "Cinza" + +#: sheep.lua +msgid "Magenta" +msgstr "Rosa Magenta" + +#: sheep.lua +msgid "Orange" +msgstr "Laranja" + +#: sheep.lua +msgid "Pink" +msgstr "Rosa" + +#: sheep.lua +msgid "Red" +msgstr "Vermelho" + +#: sheep.lua +msgid "Violet" +msgstr "Violeta" + +#: sheep.lua +msgid "White" +msgstr "Branco" + +#: sheep.lua +msgid "Yellow" +msgstr "Amarelo" + +#: sheep.lua +msgid "@1 Sheep" +msgstr "Ovelha @1 " + +#: sheep.lua +msgid "Raw Mutton" +msgstr "Carneiro (Cru)" + +#: sheep.lua +msgid "Cooked Mutton" +msgstr "Carneiro (Assado)" + +#: warthog.lua +msgid "Warthog" +msgstr "Javali" + +#: warthog.lua +msgid "Raw Porkchop" +msgstr "Costeleta de Javali (Crua)" + +#: warthog.lua +msgid "Cooked Porkchop" +msgstr "Costeleta de Javali Assada" diff --git a/locale/pt.txt b/locale/pt.txt new file mode 100644 index 0000000..60d9f5c --- /dev/null +++ b/locale/pt.txt @@ -0,0 +1,46 @@ +# textdomain: Lunovox Heavenfinder (https://libreplanet.org/wiki/User:Lunovox) +Bee=Abelha +Honey=Mel +Beehive=Colméia +Honey Block=Bloco de Mel +Bunny=Coelho +Raw Rabbit=Carne de Coelho (Cru) +Cooked Rabbit=Coelho (Assado) +Rabbit Hide=Pele de Coelho +Chicken=Galinha +Chicken Egg=Ovo de Galinha +Fried Egg=Ovo Frito +Raw Chicken=Carne de Galinha (Crua) +Cooked Chicken=Galinha Assada +Feather=Pluma +Cow already milked!=Vaca já ordenhada! +Cow=Vaca +Bucket of Milk=Balde de leite +Cheese=Queijo +Cheese Block=Bloco de Queijo +[MOD] Mobs Redo 'Animals' loaded=[MOBS_ANIMAL] Mod carregado completamente +Kitten=Gato +Penguin=Pinguim +Rat=Rato +Cooked Rat=Rato (Assado) +Black=Preto +Blue=Azul +Brown=Marrom +Cyan=Ciano +Dark Green=Verde Escuro +Dark Grey=Cinza Escuro +Green=Verde +Grey=Cinza +Magenta=Rosa Magenta +Orange=Laranja +Pink=Rosa +Red=Vermelho +Violet=Violeta +White=Branco +Yellow=Amarelo +@1 Sheep=Ovelha @1 +Raw Mutton=Carneiro (Cru) +Cooked Mutton=Carneiro (Assado) +Warthog=Javali +Raw Porkchop=Costeleta de Javali (Crua) +Cooked Porkchop=Costeleta de Javali Assada diff --git a/locale/pt_BR.po b/locale/pt_BR.po new file mode 100644 index 0000000..20f09d6 --- /dev/null +++ b/locale/pt_BR.po @@ -0,0 +1,199 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-31 11:28+0200\n" +"PO-Revision-Date: 2021-06-20 18:51-0300\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.0.6\n" +"Last-Translator: Lunovox Heavenfinder \n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Language: pt_BR\n" + +#: bee.lua +msgid "Bee" +msgstr "Abelha" + +#: bee.lua +msgid "Honey" +msgstr "Mel" + +#: bee.lua +msgid "Beehive" +msgstr "Colméia" + +#: bee.lua +msgid "Honey Block" +msgstr "Bloco de Mel" + +#: bunny.lua +msgid "Bunny" +msgstr "Coelho" + +#: bunny.lua +msgid "Raw Rabbit" +msgstr "Carne de Coelho (Cru)" + +#: bunny.lua +msgid "Cooked Rabbit" +msgstr "Coelho (Assado)" + +#: bunny.lua +msgid "Rabbit Hide" +msgstr "Pele de Coelho" + +#: chicken.lua +msgid "Chicken" +msgstr "Galinha" + +#: chicken.lua +msgid "Chicken Egg" +msgstr "Ovo de Galinha" + +#: chicken.lua +msgid "Fried Egg" +msgstr "Ovo Frito" + +#: chicken.lua +msgid "Raw Chicken" +msgstr "Carne de Galinha (Crua)" + +#: chicken.lua +msgid "Cooked Chicken" +msgstr "Galinha Assada" + +#: chicken.lua +msgid "Feather" +msgstr "Pluma" + +#: cow.lua +msgid "Cow already milked!" +msgstr "Vaca já ordenhada!" + +#: cow.lua +msgid "Cow" +msgstr "Vaca" + +#: cow.lua +msgid "Bucket of Milk" +msgstr "Balde de leite" + +#: cow.lua +msgid "Cheese" +msgstr "Queijo" + +#: cow.lua +msgid "Cheese Block" +msgstr "Bloco de Queijo" + +#: init.lua +msgid "[MOD] Mobs Redo 'Animals' loaded" +msgstr "[MOBS_ANIMAL] Mod carregado completamente" + +#: kitten.lua +msgid "Kitten" +msgstr "Gato" + +#: penguin.lua +msgid "Penguin" +msgstr "Pinguim" + +#: rat.lua +msgid "Rat" +msgstr "Rato" + +#: rat.lua +msgid "Cooked Rat" +msgstr "Rato (Assado)" + +#: sheep.lua +msgid "Black" +msgstr "Preto" + +#: sheep.lua +msgid "Blue" +msgstr "Azul" + +#: sheep.lua +msgid "Brown" +msgstr "Marrom" + +#: sheep.lua +msgid "Cyan" +msgstr "Ciano" + +#: sheep.lua +msgid "Dark Green" +msgstr "Verde Escuro" + +#: sheep.lua +msgid "Dark Grey" +msgstr "Cinza Escuro" + +#: sheep.lua +msgid "Green" +msgstr "Verde" + +#: sheep.lua +msgid "Grey" +msgstr "Cinza" + +#: sheep.lua +msgid "Magenta" +msgstr "Rosa Magenta" + +#: sheep.lua +msgid "Orange" +msgstr "Laranja" + +#: sheep.lua +msgid "Pink" +msgstr "Rosa" + +#: sheep.lua +msgid "Red" +msgstr "Vermelho" + +#: sheep.lua +msgid "Violet" +msgstr "Violeta" + +#: sheep.lua +msgid "White" +msgstr "Branco" + +#: sheep.lua +msgid "Yellow" +msgstr "Amarelo" + +#: sheep.lua +msgid "@1 Sheep" +msgstr "Ovelha @1 " + +#: sheep.lua +msgid "Raw Mutton" +msgstr "Carneiro (Cru)" + +#: sheep.lua +msgid "Cooked Mutton" +msgstr "Carneiro (Assado)" + +#: warthog.lua +msgid "Warthog" +msgstr "Javali" + +#: warthog.lua +msgid "Raw Porkchop" +msgstr "Costeleta de Javali (Crua)" + +#: warthog.lua +msgid "Cooked Porkchop" +msgstr "Costeleta de Javali Assada" diff --git a/locale/pt_BR.txt b/locale/pt_BR.txt new file mode 100644 index 0000000..60d9f5c --- /dev/null +++ b/locale/pt_BR.txt @@ -0,0 +1,46 @@ +# textdomain: Lunovox Heavenfinder (https://libreplanet.org/wiki/User:Lunovox) +Bee=Abelha +Honey=Mel +Beehive=Colméia +Honey Block=Bloco de Mel +Bunny=Coelho +Raw Rabbit=Carne de Coelho (Cru) +Cooked Rabbit=Coelho (Assado) +Rabbit Hide=Pele de Coelho +Chicken=Galinha +Chicken Egg=Ovo de Galinha +Fried Egg=Ovo Frito +Raw Chicken=Carne de Galinha (Crua) +Cooked Chicken=Galinha Assada +Feather=Pluma +Cow already milked!=Vaca já ordenhada! +Cow=Vaca +Bucket of Milk=Balde de leite +Cheese=Queijo +Cheese Block=Bloco de Queijo +[MOD] Mobs Redo 'Animals' loaded=[MOBS_ANIMAL] Mod carregado completamente +Kitten=Gato +Penguin=Pinguim +Rat=Rato +Cooked Rat=Rato (Assado) +Black=Preto +Blue=Azul +Brown=Marrom +Cyan=Ciano +Dark Green=Verde Escuro +Dark Grey=Cinza Escuro +Green=Verde +Grey=Cinza +Magenta=Rosa Magenta +Orange=Laranja +Pink=Rosa +Red=Vermelho +Violet=Violeta +White=Branco +Yellow=Amarelo +@1 Sheep=Ovelha @1 +Raw Mutton=Carneiro (Cru) +Cooked Mutton=Carneiro (Assado) +Warthog=Javali +Raw Porkchop=Costeleta de Javali (Crua) +Cooked Porkchop=Costeleta de Javali Assada From c2fa3e300c79c7dd80b6fe91a8b5082bb6b3d934 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sat, 24 Jul 2021 22:21:59 +0100 Subject: [PATCH 19/19] make default optional dependency --- depends.txt | 2 +- mod.conf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/depends.txt b/depends.txt index 3168c5a..6eca2d8 100644 --- a/depends.txt +++ b/depends.txt @@ -1,4 +1,4 @@ -default mobs +default? lucky_block? intllib? diff --git a/mod.conf b/mod.conf index 2cc6715..1a31db8 100644 --- a/mod.conf +++ b/mod.conf @@ -1,4 +1,4 @@ name = mobs_animal -depends = default, mobs -optional_depends = lucky_block, intllib +depends = mobs +optional_depends = default, lucky_block, intllib description = Adds farm animals.