From ff79af26e414106da3b9818ba9e15b2de6145eb5 Mon Sep 17 00:00:00 2001 From: PrairieWind Date: Sat, 11 Feb 2023 19:25:05 -0700 Subject: [PATCH 1/4] Add Lily of the Valley Flower Awesome Lily Texture by Nicu --- mods/ITEMS/mcl_dye/init.lua | 5 +++++ mods/ITEMS/mcl_flowers/register.lua | 6 ++++++ mods/ITEMS/mcl_sus_stew/init.lua | 4 ++-- mods/MAPGEN/mcl_biomes/init.lua | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/mods/ITEMS/mcl_dye/init.lua b/mods/ITEMS/mcl_dye/init.lua index c92e43301..73202917f 100644 --- a/mods/ITEMS/mcl_dye/init.lua +++ b/mods/ITEMS/mcl_dye/init.lua @@ -526,6 +526,11 @@ minetest.register_craft({ recipe = {{"mcl_flowers:rose_bush"}}, }) +minetest.register_craft({ + output = "mcl_dye:white", + recipe = {{"mcl_flowers:lily_of_the_valley"}}, +}) + minetest.register_craft({ type = "cooking", output = "mcl_dye:dark_green", diff --git a/mods/ITEMS/mcl_flowers/register.lua b/mods/ITEMS/mcl_flowers/register.lua index c1bd37878..0f6e377ce 100644 --- a/mods/ITEMS/mcl_flowers/register.lua +++ b/mods/ITEMS/mcl_flowers/register.lua @@ -66,3 +66,9 @@ mcl_flowers.register_simple_flower("wither_rose", { selection_box = { -3/16, -0.5, -3/16, 3/16, 6/16, 3/16 }, potted = true, }) +mcl_flowers.register_simple_flower("lily_of_the_valley", { + desc = S("Lily of the Valley"), + image = "mcl_flowers_lily_of_the_valley.png", + selection_box = { -5/16, -0.5, -5/16, 4/16, 5/16, 5/16 }, + potted = true, +}) diff --git a/mods/ITEMS/mcl_sus_stew/init.lua b/mods/ITEMS/mcl_sus_stew/init.lua index b605b8a45..ca192ddda 100644 --- a/mods/ITEMS/mcl_sus_stew/init.lua +++ b/mods/ITEMS/mcl_sus_stew/init.lua @@ -6,7 +6,7 @@ local eat = minetest.item_eat(6, "mcl_core:bowl") --6 hunger points, player rece local flower_effect = { [ "mcl_flowers:allium" ] = "fire_resistance", - [ "mcl_flowers:tulip_white" ] = "poison", + [ "mcl_flowers:lily_of_the_valley" ] = "poison", [ "mcl_flowers:blue_orchid" ] = "hunger", [ "mcl_flowers:dandelion" ] = "hunger", [ "mcl_flowers:peony" ] = "jump", @@ -108,7 +108,7 @@ minetest.register_craft({ minetest.register_craft({ type = "shapeless", output = "mcl_sus_stew:stew", - recipe = {"mcl_mushrooms:mushroom_red", "mcl_mushrooms:mushroom_brown", "mcl_core:bowl", "mcl_flowers:tulip_white"}, + recipe = {"mcl_mushrooms:mushroom_red", "mcl_mushrooms:mushroom_brown", "mcl_core:bowl", "mcl_flowers:lily_of_the_valley"}, }) minetest.register_craft({ diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua index fc2864fcf..9dd054307 100644 --- a/mods/MAPGEN/mcl_biomes/init.lua +++ b/mods/MAPGEN/mcl_biomes/init.lua @@ -5288,6 +5288,7 @@ local function register_decorations() register_flower("allium", nil, 0) -- flower Forest only register_flower("blue_orchid", {"Swampland"}, 64500, false) + register_flower("lily_of_the_valley", nil, 436) end -- Decorations in non-Overworld dimensions From 06f47a0756a00da0cb8ab117607ca7097c3b8063 Mon Sep 17 00:00:00 2001 From: PrairieWind Date: Sat, 11 Feb 2023 19:38:28 -0700 Subject: [PATCH 2/4] Add Cornflowers Evidently I didn't include the lily texture in the lily of the valley commit, so it is in this one. Again, lily of the valley texture by Nicu --- mods/ITEMS/mcl_dye/init.lua | 5 +++++ mods/ITEMS/mcl_flowers/register.lua | 6 ++++++ mods/ITEMS/mcl_sus_stew/init.lua | 4 ++-- mods/MAPGEN/mcl_biomes/init.lua | 1 + textures/mcl_flowers_cornflower.png | Bin 0 -> 292 bytes textures/mcl_flowers_lily_of_the_valley.png | Bin 0 -> 230 bytes 6 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 textures/mcl_flowers_cornflower.png create mode 100644 textures/mcl_flowers_lily_of_the_valley.png diff --git a/mods/ITEMS/mcl_dye/init.lua b/mods/ITEMS/mcl_dye/init.lua index 73202917f..98eb804bf 100644 --- a/mods/ITEMS/mcl_dye/init.lua +++ b/mods/ITEMS/mcl_dye/init.lua @@ -456,6 +456,11 @@ minetest.register_craft({ recipe = {{"mcl_core:lapis"}}, }) +minetest.register_craft({ + output = "mcl_dye:blue", + recipe = {{"mcl_flowers:cornflower"}}, +}) + minetest.register_craft({ output = "mcl_dye:lightblue", recipe = {{"mcl_flowers:blue_orchid"}}, diff --git a/mods/ITEMS/mcl_flowers/register.lua b/mods/ITEMS/mcl_flowers/register.lua index 0f6e377ce..dc0f7d9a0 100644 --- a/mods/ITEMS/mcl_flowers/register.lua +++ b/mods/ITEMS/mcl_flowers/register.lua @@ -72,3 +72,9 @@ mcl_flowers.register_simple_flower("lily_of_the_valley", { selection_box = { -5/16, -0.5, -5/16, 4/16, 5/16, 5/16 }, potted = true, }) +mcl_flowers.register_simple_flower("cornflower", { + desc = S("Cornflower"), + image = "mcl_flowers_cornflower.png", + selection_box = { -4/16, -0.5, -4/16, 4/16, 3/16, 4/16 }, + potted = true, +}) diff --git a/mods/ITEMS/mcl_sus_stew/init.lua b/mods/ITEMS/mcl_sus_stew/init.lua index ca192ddda..cfb294532 100644 --- a/mods/ITEMS/mcl_sus_stew/init.lua +++ b/mods/ITEMS/mcl_sus_stew/init.lua @@ -9,7 +9,7 @@ local flower_effect = { [ "mcl_flowers:lily_of_the_valley" ] = "poison", [ "mcl_flowers:blue_orchid" ] = "hunger", [ "mcl_flowers:dandelion" ] = "hunger", - [ "mcl_flowers:peony" ] = "jump", + [ "mcl_flowers:cornflower" ] = "jump", [ "mcl_flowers:oxeye_daisy" ] = "regeneration", [ "mcl_flowers:poppy" ] = "night_vision" } @@ -126,7 +126,7 @@ minetest.register_craft({ minetest.register_craft({ type = "shapeless", output = "mcl_sus_stew:stew", - recipe = {"mcl_mushrooms:mushroom_red", "mcl_mushrooms:mushroom_brown", "mcl_core:bowl", "mcl_flowers:peony"}, + recipe = {"mcl_mushrooms:mushroom_red", "mcl_mushrooms:mushroom_brown", "mcl_core:bowl", "mcl_flowers:cornflower"}, }) minetest.register_craft({ diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua index 9dd054307..034836e2a 100644 --- a/mods/MAPGEN/mcl_biomes/init.lua +++ b/mods/MAPGEN/mcl_biomes/init.lua @@ -5289,6 +5289,7 @@ local function register_decorations() register_flower("blue_orchid", {"Swampland"}, 64500, false) register_flower("lily_of_the_valley", nil, 436) + register_flower("cornflower", {"Plains", "SunflowerPlains"}, 536) end -- Decorations in non-Overworld dimensions diff --git a/textures/mcl_flowers_cornflower.png b/textures/mcl_flowers_cornflower.png new file mode 100644 index 0000000000000000000000000000000000000000..c7981aac7c8a9bb7759dfec34f901560f8073bdf GIT binary patch literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFi(FtGqSF!{_W%EXB^Pb=Ktt^~Gre3(ee)U<|Mh0Bv&|AtI+Wkd zejGUkWOqrBUoenn*gQFH7LW?^ba4#fxSnj##>7^`qxO1kz_EA1yA^wESNr+18Lx>- zbC%dW-A$*>AWg;jO2k@?HiJ{m-Iu!^d%j$`^eI6=*<`Jbs7~sud9Rq#IA$-gl9py> X*tA|bWMRe0Hjpizu6{1-oD!M<_w8Ka literal 0 HcmV?d00001 diff --git a/textures/mcl_flowers_lily_of_the_valley.png b/textures/mcl_flowers_lily_of_the_valley.png new file mode 100644 index 0000000000000000000000000000000000000000..b204c4d9758ef80f186d8da907549041c2abf492 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHVEbxddW?AlB2X!D@$5Y2R#Mm^#^xM~8|Np=G z|Nnn~PhdAt9aBk=UoZnh+2pepKpta~x4R3s{PiOTfE+7N7sn8e>&XcRm@TXq^h92k zPHV literal 0 HcmV?d00001 From b79f74c390525181ca738d58f154f1477b20f883 Mon Sep 17 00:00:00 2001 From: PrairieWind Date: Sat, 11 Feb 2023 19:56:03 -0700 Subject: [PATCH 3/4] Update Translation Template for flowers --- mods/ITEMS/mcl_flowers/locale/template.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mods/ITEMS/mcl_flowers/locale/template.txt b/mods/ITEMS/mcl_flowers/locale/template.txt index 53a6e7495..0d84093de 100644 --- a/mods/ITEMS/mcl_flowers/locale/template.txt +++ b/mods/ITEMS/mcl_flowers/locale/template.txt @@ -11,6 +11,9 @@ White Tulip= Allium= Azure Bluet= Blue Orchid= +Wither Rose= +Lily of the Valley= +Cornflower= Tall Grass= Tall grass is a small plant which often occurs on the surface of grasslands. It can be harvested for wheat seeds. By using bone meal, tall grass can be turned into double tallgrass which is two blocks high.= Fern= From 5da6c25ccf1aee5cece9935c6fc64e1ecc03b37d Mon Sep 17 00:00:00 2001 From: PrairieWind Date: Sun, 12 Feb 2023 13:59:52 -0700 Subject: [PATCH 4/4] Fix cornflower biomes and change seed values for cornflowers and lilies of the valley --- mods/MAPGEN/mcl_biomes/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua index 034836e2a..c85bcbec1 100644 --- a/mods/MAPGEN/mcl_biomes/init.lua +++ b/mods/MAPGEN/mcl_biomes/init.lua @@ -5288,8 +5288,8 @@ local function register_decorations() register_flower("allium", nil, 0) -- flower Forest only register_flower("blue_orchid", {"Swampland"}, 64500, false) - register_flower("lily_of_the_valley", nil, 436) - register_flower("cornflower", {"Plains", "SunflowerPlains"}, 536) + register_flower("lily_of_the_valley", nil, 325) + register_flower("cornflower", flower_biomes2, 486) end -- Decorations in non-Overworld dimensions