From 7d8fdc6ec3a67106c6642a01b9da3269bc79e855 Mon Sep 17 00:00:00 2001 From: kabou Date: Thu, 22 Dec 2022 19:32:15 +0100 Subject: [PATCH] Separate brown dye from cocoa beans. * Add craftitem "mcl_cocoas:cocoa_beans". * Add texture for brown dye item. * Merge craftitem registration for "mcl_dye:brown" with generic dyes. * Add crafting recipe for brown dye. * Add legacy conversion recipe. * Update dyes table. * Update translations. * Update cookie recipe. --- mods/ITEMS/mcl_cocoas/init.lua | 17 ++++++++--- mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.de.tr | 4 +++ mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.es.tr | 4 +++ mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.fr.tr | 4 +++ mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.pl.tr | 4 +++ mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.ru.tr | 4 +++ .../mcl_cocoas/locale/mcl_cocoas.zh_TW.tr | 4 +++ mods/ITEMS/mcl_cocoas/locale/template.txt | 4 +++ .../textures/mcl_cocoas_cocoa_beans.png | Bin 0 -> 244 bytes mods/ITEMS/mcl_dye/init.lua | 27 +++++++----------- mods/ITEMS/mcl_dye/locale/mcl_dye.de.tr | 2 +- mods/ITEMS/mcl_dye/locale/mcl_dye.es.tr | 2 +- mods/ITEMS/mcl_dye/locale/mcl_dye.fr.tr | 2 +- mods/ITEMS/mcl_dye/locale/mcl_dye.pl.tr | 2 +- mods/ITEMS/mcl_dye/locale/mcl_dye.ru.tr | 2 +- mods/ITEMS/mcl_dye/locale/mcl_dye.zh_TW.tr | 2 +- mods/ITEMS/mcl_dye/locale/template.txt | 2 +- mods/ITEMS/mcl_dye/textures/mcl_dye_brown.png | Bin 244 -> 193 bytes mods/ITEMS/mcl_farming/wheat.lua | 2 +- 19 files changed, 60 insertions(+), 28 deletions(-) create mode 100644 mods/ITEMS/mcl_cocoas/textures/mcl_cocoas_cocoa_beans.png diff --git a/mods/ITEMS/mcl_cocoas/init.lua b/mods/ITEMS/mcl_cocoas/init.lua index cc3b88705..7c22927f8 100644 --- a/mods/ITEMS/mcl_cocoas/init.lua +++ b/mods/ITEMS/mcl_cocoas/init.lua @@ -62,8 +62,6 @@ function mcl_cocoas.grow(pos) return false end --- Note: cocoa beans are implemented as mcl_dye:brown - -- Cocoa definition -- 1st stage local crop_def = { @@ -78,7 +76,7 @@ local crop_def = { sunlight_propagates = true, paramtype2 = "facedir", walkable = true, - drop = "mcl_dye:brown", + drop = "mcl_cocoas:cocoa_beans", collision_box = { type = "fixed", fixed = { @@ -142,9 +140,20 @@ crop_def.selection_box = { {-0.25, -0.3125, -0.0625, 0.25, 0.5, 0.5}, }, } -crop_def.drop = "mcl_dye:brown 3" +crop_def.drop = "mcl_cocoas:cocoa_beans 3" minetest.register_node("mcl_cocoas:cocoa_3", table.copy(crop_def)) +minetest.register_craftitem("mcl_cocoas:cocoa_beans", { + description = S("Cocoa Beans"), + _tt_help = S("Grows at the side of jungle trees"), + _doc_items_longdesc = S("Cocoa beans can be used to plant cocoa, bake cookies or craft brown dye."), + _doc_items_usagehelp = S("Right click on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa."), + inventory_image = "mcl_cocoas_cocoa_beans.png", + groups = {craftitem = 1, compostability = 65}, + on_place = function(itemstack, placer, pointed_thing) + return cocoa_place(itemstack, placer, pointed_thing, "mcl_cocoas:cocoa_1") + end, +}) minetest.register_abm({ label = "Cocoa pod growth", diff --git a/mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.de.tr b/mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.de.tr index 479e3845e..3740c41cf 100644 --- a/mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.de.tr +++ b/mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.de.tr @@ -1,4 +1,8 @@ # textdomain: mcl_cocoas +Cocoa Beans=Kakaobohnen +Grows at the side of jungle trees=Wächst an der Seite von Dschungelbäumen +Cocoa beans can be used to plant cocoa pods, bake chocolate cookies or craft brown dye.=Kakaobohnen können benutzt werden, um Kakao anzupflanzen, Kekse zu backen oder braune Farbstoffe herzustellen. +Right click on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=Rechtsklicken Sie an die Seite eines Dschungelbaumstamms (Dschungelholz), um eine junge Kakaoschote zu pflanzen. Premature Cocoa Pod=Junge Kakaoschote Cocoa pods grow on the side of jungle trees in 3 stages.=Kakaoschoten wachsen an der Seite von Dschungelbäumen in 3 Stufen. Medium Cocoa Pod=Mittelgroße Kakaoschote diff --git a/mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.es.tr b/mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.es.tr index e1477c79c..c76fc512f 100644 --- a/mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.es.tr +++ b/mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.es.tr @@ -1,4 +1,8 @@ # textdomain: mcl_cocoas +Cocoa Beans=Granos de cacao +Grows at the side of jungle trees=Crece al lado de los árboles de la jungla +Cocoa beans can be used to plant cocoa, bake cookies or craft brown dye.=Los granos de cacao se pueden usar para plantar cacao, hornear galletas o hacer tintes marrones. +Right click on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=Haga clic derecho en el costado del tronco de un árbol de la jungla para plantar un cacao joven. Premature Cocoa Pod=Vaina de cacao prematura Cocoa pods grow on the side of jungle trees in 3 stages.=Las vainas de cacao crecen al lado de los árboles de jungla en 3 etapas. Medium Cocoa Pod=Vaina de cacao mediana diff --git a/mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.fr.tr b/mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.fr.tr index bf5468953..5d64eb5be 100644 --- a/mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.fr.tr +++ b/mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.fr.tr @@ -1,4 +1,8 @@ # textdomain: mcl_cocoas +Cocoa Beans=Fèves de Cacao +Grows at the side of jungle trees=Pousse à côté des arbres de la jungle +Cocoa beans can be used to plant cocoa, bake cookies or craft brown dye.=Les fèves de cacao peuvent être utilisées pour planter du cacao, faire des biscuits ou fabriquer de la teinture brune. +Right click on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=Clic droit sur le côté d'un tronc d'arbre de la jungle (Bois Acajou) pour planter un jeune cacaoyer. Premature Cocoa Pod=Gousse de cacao prématurée Cocoa pods grow on the side of jungle trees in 3 stages.=Les cabosses de cacao poussent sur le côté des arbres d'Acajou en 3 étapes. Medium Cocoa Pod=Gousse de cacao moyenne diff --git a/mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.pl.tr b/mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.pl.tr index bfd0d707e..83df9be7a 100644 --- a/mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.pl.tr +++ b/mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.pl.tr @@ -1,4 +1,8 @@ # textdomain: mcl_cocoas +Cocoa Beans=Ziarna kakaowe +Grows at the side of jungle trees=Rośnie na boku tropikalnych drzew +Cocoa beans can be used to plant cocoa, bake cookies or craft brown dye.=Ziarna kakaowe mogą być używane do sadzenia kakao, pieczenia ciasteczek lub robienia brązowego barwnika. +Right click on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=Naciśnij prawym na boku tropikalnego pnia (Tropikalne drewno) aby zasadzić młode kakao. Premature Cocoa Pod=Niedojrzała roślina kakao Cocoa pods grow on the side of jungle trees in 3 stages.=Roślina kakao rośnie na bokach tropikalnych drzew w 3 etapach Medium Cocoa Pod=Średnio-dojrzała roślina kakao diff --git a/mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.ru.tr b/mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.ru.tr index 524c28bcc..064c01fd3 100644 --- a/mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.ru.tr +++ b/mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.ru.tr @@ -1,4 +1,8 @@ # textdomain: mcl_cocoas +Cocoa Beans=Какао-бобы +Grows at the side of jungle trees=Растут на стволах деревьев джунглей +Cocoa beans can be used to plant cocoa, bake cookies or craft brown dye.=Какао-бобы можно использовать для посадки какао, выпечки печенья или изготовления коричневого красителя. +Right click on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=Кликните правой по боковой части ствола дерева джунглей, чтобы посадить молодое какао. Premature Cocoa Pod=Молодой стручок какао Cocoa pods grow on the side of jungle trees in 3 stages.=Стручки какао растут на деревьях джунглей в 3 этапа. Medium Cocoa Pod=Средний стручок какао diff --git a/mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.zh_TW.tr b/mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.zh_TW.tr index d71e2b11b..038746155 100644 --- a/mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.zh_TW.tr +++ b/mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.zh_TW.tr @@ -1,4 +1,8 @@ # textdomain: mcl_cocoas +Cocoa Beans=可可豆 +Grows at the side of jungle trees=在叢林木側生長 +Cocoa beans can be used to plant cocoa, bake cookies or craft brown dye.=可可豆可用於種植可可、烘烤餅乾或製作棕色染料。 +Right click on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=右鍵點擊叢林木的一側，可以種植一個可可。 Premature Cocoa Pod=成長中的可可豆莢（第1階段） Cocoa pods grow on the side of jungle trees in 3 stages.=可可莢果分3個階段生長在叢林樹的側面。 Medium Cocoa Pod=成長中的可可豆莢（第2階段） diff --git a/mods/ITEMS/mcl_cocoas/locale/template.txt b/mods/ITEMS/mcl_cocoas/locale/template.txt index f68318cae..cb8c5bbfd 100644 --- a/mods/ITEMS/mcl_cocoas/locale/template.txt +++ b/mods/ITEMS/mcl_cocoas/locale/template.txt @@ -1,4 +1,8 @@ # textdomain: mcl_cocoas +Cocoa Beans= +Grows at the side of jungle trees= +Cocoa beans can be used to plant cocoa, bake cookies or craft brown dye.= +Right click on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.= Premature Cocoa Pod= Cocoa pods grow on the side of jungle trees in 3 stages.= Medium Cocoa Pod= diff --git a/mods/ITEMS/mcl_cocoas/textures/mcl_cocoas_cocoa_beans.png b/mods/ITEMS/mcl_cocoas/textures/mcl_cocoas_cocoa_beans.png new file mode 100644 index 0000000000000000000000000000000000000000..877ee69dc21408459230246d7cbd736b577aa00b GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv3GfMV{r~@efs1OGtu7Ev&J8W_ zx3bq&R8mmR33So)^PEwi2oz~_u~z`9=P3#D3kK3aE&qWO1H-fQ&)BhR#kkl@J-3m7(QdwUd3Vw#Zp?3K)eRVbP0l+XkK04GfD literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_dye/init.lua b/mods/ITEMS/mcl_dye/init.lua index 2dbaa7569..6c3ea93f0 100644 --- a/mods/ITEMS/mcl_dye/init.lua +++ b/mods/ITEMS/mcl_dye/init.lua @@ -78,7 +78,7 @@ dyelocal.dyes = { {"dark_green", "dye_dark_green", S("Cactus Green"),{dye=1, craftitem=1, basecolor_green=1, excolor_green=1, unicolor_dark_green=1}}, {"green", "mcl_dye_lime", S("Lime Dye"), {dye=1, craftitem=1, basecolor_green=1, excolor_green=1, unicolor_green=1}}, {"yellow", "dye_yellow", S("Dandelion Yellow"), {dye=1, craftitem=1, basecolor_yellow=1, excolor_yellow=1, unicolor_yellow=1}}, - {"brown", "mcl_dye_brown", S("Cocoa Beans"), {dye=1, craftitem=1, basecolor_brown=1, excolor_orange=1, unicolor_dark_orange=1, compostability = 65}}, + {"brown", "mcl_dye_brown", S("Brown Dye"), {dye=1, craftitem=1, basecolor_brown=1, excolor_orange=1, unicolor_dark_orange=1, compostability = 65}}, {"orange", "dye_orange", S("Orange Dye"), {dye=1, craftitem=1, basecolor_orange=1, excolor_orange=1, unicolor_orange=1}}, {"red", "dye_red", S("Rose Red"), {dye=1, craftitem=1, basecolor_red=1, excolor_red=1, unicolor_red=1}}, {"magenta", "dye_magenta", S("Magenta Dye"), {dye=1, craftitem=1, basecolor_magenta=1, excolor_red_violet=1,unicolor_red_violet=1}}, @@ -109,8 +109,8 @@ end -- Define items for _, row in ipairs(dyelocal.dyes) do local name = row[1] - -- White and brown dyes are defined explicitly below - if name ~= "white" and name ~= "brown" then + -- White dye is defined explicitly below + if name ~= "white" then local img = row[2] local description = row[3] local groups = row[4] @@ -421,19 +421,6 @@ minetest.register_craftitem("mcl_dye:white", { _dispense_into_walkable = true }) -minetest.register_craftitem("mcl_dye:brown", { - inventory_image = "mcl_dye_brown.png", - _tt_help = S("Grows at the side of jungle trees"), - _doc_items_longdesc = S("Cocoa beans are a brown dye and can be used to plant cocoas."), - _doc_items_usagehelp = S("Rightclick a sheep to turn its wool brown. Rightclick on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa."), - description = S("Cocoa Beans"), - stack_max = 64, - groups = dyelocal.dyes[12][4], - on_place = function(itemstack, placer, pointed_thing) - return mcl_cocoas.place(itemstack, placer, pointed_thing, "mcl_cocoas:cocoa_1") - end, -}) - -- Dye mixing minetest.register_craft({ type = "shapeless", @@ -544,6 +531,10 @@ minetest.register_craft({ output = "mcl_dye:orange", recipe = {{"mcl_flowers:tulip_orange"}}, }) +minetest.register_craft({ + output = "mcl_dye:brown", + recipe = {{"mcl_cocoas:cocoa_beans"}}, +}) minetest.register_craft({ output = "mcl_dye:pink", recipe = {{"mcl_flowers:tulip_pink"}}, @@ -589,3 +580,7 @@ minetest.register_craft({ output = "mcl_core:lapis", recipe = {{"mcl_dye:blue"}}, }) +minetest.register_craft({ + output = "mcl_cocoas:cocoa_beans", + recipe = {{"mcl_dye:brown"}}, +}) diff --git a/mods/ITEMS/mcl_dye/locale/mcl_dye.de.tr b/mods/ITEMS/mcl_dye/locale/mcl_dye.de.tr index 482b8da1d..8af2a82f3 100644 --- a/mods/ITEMS/mcl_dye/locale/mcl_dye.de.tr +++ b/mods/ITEMS/mcl_dye/locale/mcl_dye.de.tr @@ -10,7 +10,7 @@ Cyan Dye=Türkiser Farbstoff Cactus Green=Kaktusgrün Lime Dye=Lindgrüner Farbstoff Dandelion Yellow=Löwenzahngelb -Cocoa Beans=Kakaobohnen +Brown Dye=Brauner Farbstoff Orange Dye=Orange Farbstoff Rose Red=Rosenrot Magenta Dye=Magenta Farbstoff diff --git a/mods/ITEMS/mcl_dye/locale/mcl_dye.es.tr b/mods/ITEMS/mcl_dye/locale/mcl_dye.es.tr index c04cb4ef2..af2194bf3 100644 --- a/mods/ITEMS/mcl_dye/locale/mcl_dye.es.tr +++ b/mods/ITEMS/mcl_dye/locale/mcl_dye.es.tr @@ -10,7 +10,7 @@ Cyan Dye=Tinte cian Cactus Green=Tinte verde Lime Dye=Tinte amarillo verdoso Dandelion Yellow=Tinte amarillo -Cocoa Beans=Granos de cacao +Brown Dye=Tinte marrón Orange Dye=Tinte naranja Rose Red=Tinte rojo Magenta Dye=Tinte magenta diff --git a/mods/ITEMS/mcl_dye/locale/mcl_dye.fr.tr b/mods/ITEMS/mcl_dye/locale/mcl_dye.fr.tr index 825afb02e..42fc96279 100644 --- a/mods/ITEMS/mcl_dye/locale/mcl_dye.fr.tr +++ b/mods/ITEMS/mcl_dye/locale/mcl_dye.fr.tr @@ -10,7 +10,7 @@ Cyan Dye=Teinture Cyan Cactus Green=Cactus Vert Lime Dye=Teinture Vert Clair Dandelion Yellow=Teinture Jaune -Cocoa Beans=Fèves de Cacao +Brown Dye=Teinture Marron Orange Dye=Teinture Orange Rose Red=Teinture Rouge Magenta Dye=Teinture Magenta diff --git a/mods/ITEMS/mcl_dye/locale/mcl_dye.pl.tr b/mods/ITEMS/mcl_dye/locale/mcl_dye.pl.tr index 985f0ff70..f8d159e19 100644 --- a/mods/ITEMS/mcl_dye/locale/mcl_dye.pl.tr +++ b/mods/ITEMS/mcl_dye/locale/mcl_dye.pl.tr @@ -10,7 +10,7 @@ Cyan Dye=Błękitna farba Cactus Green=Kaktusowa zieleń Lime Dye=Jasnozielona farba Dandelion Yellow=Mleczowy żółty -Cocoa Beans=Ziarna kakaowe +Brown Dye=Brązowy farba Orange Dye=Pomarańczowa farba Rose Red=Różany czerwony Magenta Dye=Karmazynowa farba diff --git a/mods/ITEMS/mcl_dye/locale/mcl_dye.ru.tr b/mods/ITEMS/mcl_dye/locale/mcl_dye.ru.tr index 34af5f086..dbca4a610 100644 --- a/mods/ITEMS/mcl_dye/locale/mcl_dye.ru.tr +++ b/mods/ITEMS/mcl_dye/locale/mcl_dye.ru.tr @@ -10,7 +10,7 @@ Cyan Dye=Голубой краситель Cactus Green=Зелень кактуса Lime Dye=Зелёный лаймовый краситель Dandelion Yellow=Одуванчиковый жёлтый краситель -Cocoa Beans=Какао-бобы +Brown Dye=Коричневый краситель Orange Dye=Оранжевый краситель Rose Red=Экстракт красной розы Magenta Dye=Фиолетовый краситель diff --git a/mods/ITEMS/mcl_dye/locale/mcl_dye.zh_TW.tr b/mods/ITEMS/mcl_dye/locale/mcl_dye.zh_TW.tr index 84b09c4f1..78cca1319 100644 --- a/mods/ITEMS/mcl_dye/locale/mcl_dye.zh_TW.tr +++ b/mods/ITEMS/mcl_dye/locale/mcl_dye.zh_TW.tr @@ -10,7 +10,7 @@ Cyan Dye=青色染料 Cactus Green=仙人掌綠 Lime Dye=淺綠色染料 Dandelion Yellow=蒲公英黃 -Cocoa Beans=可可豆 +Brown Dye=棕色染料 Orange Dye=橙色染料 Rose Red=玫瑰紅 Magenta Dye=洋紅色染料 diff --git a/mods/ITEMS/mcl_dye/locale/template.txt b/mods/ITEMS/mcl_dye/locale/template.txt index 069cc6cef..44f3889ab 100644 --- a/mods/ITEMS/mcl_dye/locale/template.txt +++ b/mods/ITEMS/mcl_dye/locale/template.txt @@ -10,7 +10,7 @@ Cyan Dye= Cactus Green= Lime Dye= Dandelion Yellow= -Cocoa Beans= +Brown Dye= Orange Dye= Rose Red= Magenta Dye= diff --git a/mods/ITEMS/mcl_dye/textures/mcl_dye_brown.png b/mods/ITEMS/mcl_dye/textures/mcl_dye_brown.png index 877ee69dc21408459230246d7cbd736b577aa00b..b24c84b1fb9c1ee9e5c4261c6e5f0b133b3b18d2 100644 GIT binary patch delta 165 zcmV;W09ya_0l@)~B!3%FOjJbx005b6K!RL0a!@T+KPX5zD0)UAnO!rjs_fD9Jp zj3Pk?5W~qx&?NxKaCUKV2?a5X1eHu&L7JQdg-k+03}!`T*B$_{fzGa>SS9CFjQT{NNTZ9r z0s{jBPf3tpFpvgn`46NR7@nnn{tl#yJzX3_Dj1U+m>3n(g3208V%@#E<*uc7+ zwS`66z+lF%U6M<7F-fW^u040TN!-9-N~B4PgHD=$`h$CWXEU-fB+80DQWd?Q4|0d6 LtDnm{r-UW|Xy{5O diff --git a/mods/ITEMS/mcl_farming/wheat.lua b/mods/ITEMS/mcl_farming/wheat.lua index a254ed36c..44d82b566 100644 --- a/mods/ITEMS/mcl_farming/wheat.lua +++ b/mods/ITEMS/mcl_farming/wheat.lua @@ -117,7 +117,7 @@ minetest.register_craft({ minetest.register_craft({ output = "mcl_farming:cookie 8", recipe = { - {"mcl_farming:wheat_item", "mcl_dye:brown", "mcl_farming:wheat_item"}, + {"mcl_farming:wheat_item", "mcl_cocoas:cocoa_beans", "mcl_farming:wheat_item"}, } })