From 81f89cdd786c6d46b72fc284ce1ac66e8165ffad Mon Sep 17 00:00:00 2001 From: JoseDouglas26 Date: Sat, 15 Jun 2024 08:12:31 -0300 Subject: [PATCH] Small flowers migration --- mods/ITEMS/mcl_flowers/init.lua | 35 ------------- mods/ITEMS/mcl_flowers/register.lua | 80 ----------------------------- mods/MAPGEN/mcl_biomes/init.lua | 15 +++--- mods/blocks/biota/flower.lua | 33 ++++++++++++ 4 files changed, 39 insertions(+), 124 deletions(-) create mode 100644 mods/blocks/biota/flower.lua diff --git a/mods/ITEMS/mcl_flowers/init.lua b/mods/ITEMS/mcl_flowers/init.lua index 85a65a165..1d3c71669 100644 --- a/mods/ITEMS/mcl_flowers/init.lua +++ b/mods/ITEMS/mcl_flowers/init.lua @@ -183,39 +183,6 @@ def_fern.groups.compostability = 65 minetest.register_node("mcl_flowers:fern", def_fern) - ---- Clover --- --- Similar deal as fern, we can copy a lot from tall grass -local def_clover = table.copy(def_tallgrass) -def_clover.description = S("Clover") -def_clover._doc_items_longdesc = S("Clovers are small plants which occur naturally in plains and other temperate biomes. They can be picked up and planted again.") -def_clover.drawtype = "mesh" -def_clover.mesh = "mcl_clover_3leaf.obj" -def_clover.tiles = { "mcl_flowers_clover.png" } -def_clover.inventory_image = "mcl_flowers_clover_inv.png" -def_clover.wield_image = "mcl_flowers_clover_inv.png" -def_clover.use_texture_alpha = "clip" -def_clover.drop = "mcl_flowers:clover" -def_clover.selection_box = { - type = "fixed", - fixed = { -4/16, -0.5, -4/16, 4/16, 0, 4/16 }, -} -def_clover.groups.compostability = 30 - -minetest.register_node("mcl_flowers:clover", def_clover) - -local def_4l_clover = table.copy(def_clover) -def_4l_clover.description = S("Four-leaf Clover") -def_4l_clover._doc_items_longdesc = S("Clovers are small plants which occur naturally in plains and other temperate biomes. They can be picked up and planted again.") -def_4l_clover.mesh = "mcl_clover_4leaf.obj" -def_4l_clover.tiles = { "mcl_flowers_fourleaf_clover.png" } -def_4l_clover.inventory_image = "mcl_flowers_fourleaf_clover_inv.png" -def_4l_clover.wield_image = "mcl_flowers_fourleaf_clover_inv.png" -def_4l_clover.use_texture_alpha = "clip" -def_4l_clover.drop = "mcl_flowers:fourleaf_clover" - -minetest.register_node("mcl_flowers:fourleaf_clover", def_4l_clover) - if has_mcl_flowerpots then mcl_flowerpots.register_potted_flower("mcl_flowers:fern", { name = "fern", @@ -570,5 +537,3 @@ if mod_mcimport and mg_name == "singlenode" and fix_doubleplants == true then end, }) end - -dofile(modpath.."/register.lua") diff --git a/mods/ITEMS/mcl_flowers/register.lua b/mods/ITEMS/mcl_flowers/register.lua index dc0f7d9a0..e69de29bb 100644 --- a/mods/ITEMS/mcl_flowers/register.lua +++ b/mods/ITEMS/mcl_flowers/register.lua @@ -1,80 +0,0 @@ -local S = minetest.get_translator(minetest.get_current_modname()) - -mcl_flowers.register_simple_flower("poppy", { - desc = S("Poppy"), - image = "mcl_flowers_poppy.png", - selection_box = { -5/16, -0.5, -5/16, 5/16, 5/16, 5/16 }, - potted = true, -}) -mcl_flowers.register_simple_flower("dandelion", { - desc = S("Dandelion"), - image = "flowers_dandelion_yellow.png", - selection_box = { -4/16, -0.5, -4/16, 4/16, 3/16, 4/16 }, - potted = true, -}) -mcl_flowers.register_simple_flower("oxeye_daisy", { - desc = S("Oxeye Daisy"), - image = "mcl_flowers_oxeye_daisy.png", - selection_box = { -4/16, -0.5, -4/16, 4/16, 4/16, 4/16 }, - potted = true, -}) -mcl_flowers.register_simple_flower("tulip_orange", { - desc = S("Orange Tulip"), - image = "flowers_tulip.png", - selection_box = { -3/16, -0.5, -3/16, 3/16, 5/16, 3/16 }, - potted = true, -}) -mcl_flowers.register_simple_flower("tulip_pink", { - desc = S("Pink Tulip"), - image = "mcl_flowers_tulip_pink.png", - selection_box = { -3/16, -0.5, -3/16, 3/16, 5/16, 3/16 }, - potted = true, -}) -mcl_flowers.register_simple_flower("tulip_red", { - desc = S("Red Tulip"), - image = "mcl_flowers_tulip_red.png", - selection_box = { -3/16, -0.5, -3/16, 3/16, 6/16, 3/16 }, - potted = true, -}) -mcl_flowers.register_simple_flower("tulip_white", { - desc = S("White Tulip"), - image = "mcl_flowers_tulip_white.png", - selection_box = { -3/16, -0.5, -3/16, 3/16, 4/16, 3/16 }, - potted = true, -}) -mcl_flowers.register_simple_flower("allium", { - desc = S("Allium"), - image = "mcl_flowers_allium.png", - selection_box = { -3/16, -0.5, -3/16, 3/16, 6/16, 3/16 }, - potted = true, -}) -mcl_flowers.register_simple_flower("azure_bluet", { - desc = S("Azure Bluet"), - image = "mcl_flowers_azure_bluet.png", - selection_box = { -5/16, -0.5, -5/16, 5/16, 3/16, 5/16 }, - potted = true, -}) -mcl_flowers.register_simple_flower("blue_orchid", { - desc = S("Blue Orchid"), - image = "mcl_flowers_blue_orchid.png", - selection_box = { -5/16, -0.5, -5/16, 5/16, 7/16, 5/16 }, - potted = true, -}) -mcl_flowers.register_simple_flower("wither_rose", { - desc = S("Wither Rose"), - image = "mcl_flowers_wither_rose.png", - 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/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua index f68447f37..c1aefbfac 100644 --- a/mods/MAPGEN/mcl_biomes/init.lua +++ b/mods/MAPGEN/mcl_biomes/init.lua @@ -5610,7 +5610,7 @@ local function register_decorations() y_min = 1, y_max = mcl_vars.mg_overworld_max, biomes = biomes, - decoration = "mcl_flowers:" .. name, + decoration = "blocks:" .. name, }) end if is_in_flower_forest then @@ -5629,7 +5629,7 @@ local function register_decorations() y_min = 1, y_max = mcl_vars.mg_overworld_max, biomes = {"FlowerForest"}, - decoration = "mcl_flowers:" .. name, + decoration = "blocks:" .. name, }) end end @@ -5640,10 +5640,10 @@ local function register_decorations() register_flower("poppy", flower_biomes1, 9439) local flower_biomes2 = {"Plains", "SunflowerPlains"} - register_flower("tulip_red", flower_biomes2, 436) - register_flower("tulip_orange", flower_biomes2, 536) - register_flower("tulip_pink", flower_biomes2, 636) - register_flower("tulip_white", flower_biomes2, 736) + register_flower("red_tulip", flower_biomes2, 436) + register_flower("orange_tulip", flower_biomes2, 536) + register_flower("pink_tulip", flower_biomes2, 636) + register_flower("white_tulip", flower_biomes2, 736) register_flower("azure_bluet", flower_biomes2, 800) register_flower("oxeye_daisy", flower_biomes2, 3490) @@ -5652,9 +5652,6 @@ local function register_decorations() register_flower("lily_of_the_valley", nil, 325) register_flower("cornflower", flower_biomes2, 486) - - register_flower("clover", flower_biomes1, 3, false, 0.04) - register_flower("fourleaf_clover", flower_biomes1, 13, false, -0.002) end -- Decorations in non-Overworld dimensions diff --git a/mods/blocks/biota/flower.lua b/mods/blocks/biota/flower.lua new file mode 100644 index 000000000..1b4195795 --- /dev/null +++ b/mods/blocks/biota/flower.lua @@ -0,0 +1,33 @@ +local common_defs = { + small = { + drawtype = "plantlike", + groups = {handy = 1, natural_blocks = 1, small_flowers = 1}, + paramtype = "light", + paramtype2 = "meshoptions", + place_param2 = 8, + sounds = mcl_sounds.node_sound_leaves_defaults(), + sunlight_propagates = true, + walkable = false, + waving = 1 + } +} + +local small_flowers = { + ["allium"] = {}, + ["azure_bluet"] = {}, + ["blue_orchid"] = {}, + ["cornflower"] = {}, + ["dandelion"] = {}, + ["lily_of_the_valley"] = {}, + ["orange_tulip"] = {}, + ["oxeye_daisy"] = {}, + ["pink_tulip"] = {}, + ["poppy"] = {}, + ["red_tulip"] = {}, + ["white_tulip"] = {}, + ["wither_rose"] = {} +} + +for identifier, definitions in pairs(small_flowers) do + voxelibre.register_block(identifier, table.merge(common_defs.small, definitions)) +end