diff --git a/mods/ITEMS/mcl_dye/init.lua b/mods/ITEMS/mcl_dye/init.lua index c92e43301..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"}}, @@ -526,6 +531,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/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= diff --git a/mods/ITEMS/mcl_flowers/register.lua b/mods/ITEMS/mcl_flowers/register.lua index c1bd37878..dc0f7d9a0 100644 --- a/mods/ITEMS/mcl_flowers/register.lua +++ b/mods/ITEMS/mcl_flowers/register.lua @@ -66,3 +66,15 @@ 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, +}) +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 b605b8a45..cfb294532 100644 --- a/mods/ITEMS/mcl_sus_stew/init.lua +++ b/mods/ITEMS/mcl_sus_stew/init.lua @@ -6,10 +6,10 @@ 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", + [ "mcl_flowers:cornflower" ] = "jump", [ "mcl_flowers:oxeye_daisy" ] = "regeneration", [ "mcl_flowers:poppy" ] = "night_vision" } @@ -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({ @@ -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 fc2864fcf..c85bcbec1 100644 --- a/mods/MAPGEN/mcl_biomes/init.lua +++ b/mods/MAPGEN/mcl_biomes/init.lua @@ -5288,6 +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, 325) + register_flower("cornflower", flower_biomes2, 486) 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 000000000..c7981aac7 Binary files /dev/null and b/textures/mcl_flowers_cornflower.png differ 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 000000000..b204c4d97 Binary files /dev/null and b/textures/mcl_flowers_lily_of_the_valley.png differ