diff --git a/GROUPS.md b/GROUPS.md index 34486819..9ea115cc 100644 --- a/GROUPS.md +++ b/GROUPS.md @@ -106,6 +106,8 @@ These groups are used mostly for informational purposes * `flower_pot`: Flower pot * `flower_pot=1`: Empty flower pot * `flower_pot=2`: Flower pot with a plant or flower +* `flower=1`: Flower +* `place_flowerlike=1`: Node has placement rules like that of a flower * `cake`: Cake (rating = slices left) * `book=1`: Book * `pane=1`: Node is a “pane”-like node glass pane or iron bars diff --git a/mods/HELP/mcl_doc/init.lua b/mods/HELP/mcl_doc/init.lua index bf32ad84..6dfd013d 100644 --- a/mods/HELP/mcl_doc/init.lua +++ b/mods/HELP/mcl_doc/init.lua @@ -46,11 +46,11 @@ doc.sub.items.register_factoid("nodes", "groups", function(itemstring, def) return datastring end) --- flower +-- nodes which have flower placement rules doc.sub.items.register_factoid("nodes", "groups", function(itemstring, def) local datastring = "" - if def.groups.flower == 1 then - return "This is a flower which can grow on dirt, grass blocks and podzol. To survive, it needs to have an unobstructed view to the sky above or be exposed to a light level of 8 or higher." + if def.groups.place_flowerlike == 1 then + return "This plant can only grow on dirt, grass blocks and podzol. To survive, it needs to have an unobstructed view to the sky above or be exposed to a light level of 8 or higher." end return "" end) diff --git a/mods/ITEMS/mcl_flowers/init.lua b/mods/ITEMS/mcl_flowers/init.lua index dd5f18ef..af77001a 100644 --- a/mods/ITEMS/mcl_flowers/init.lua +++ b/mods/ITEMS/mcl_flowers/init.lua @@ -39,7 +39,7 @@ local function add_simple_flower(name, desc, image, simple_selection_box) paramtype = "light", walkable = false, stack_max = 64, - groups = {dig_immediate=3,flammable=2,plant=1,flower=1,non_mycelium_plant=1,attached_node=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1,deco_block=1}, + groups = {dig_immediate=3,flammable=2,plant=1,flower=1,place_flowerlike=1,non_mycelium_plant=1,attached_node=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1,deco_block=1}, sounds = mcl_sounds.node_sound_leaves_defaults(), node_placement_prediction = "", on_place = on_place_flower, @@ -93,7 +93,7 @@ minetest.register_node("mcl_flowers:tallgrass", { buildable_to = true, is_ground_content = true, -- CHECKME: How does tall grass behave when pushed by a piston? - groups = {dig_immediate=3, flammable=3,attached_node=1,plant=1,non_mycelium_plant=1,dig_by_water=1,destroy_by_lava_flow=1,deco_block=1}, + groups = {dig_immediate=3, flammable=3,attached_node=1,plant=1,place_flowerlike=1,non_mycelium_plant=1,dig_by_water=1,destroy_by_lava_flow=1,deco_block=1}, sounds = mcl_sounds.node_sound_leaves_defaults(), drop = wheat_seed_drop, node_placement_prediction = "", @@ -121,7 +121,7 @@ minetest.register_node("mcl_flowers:fern", { walkable = false, stack_max = 64, -- CHECKME: How does a fern behave when pushed by a piston? - groups = {dig_immediate=3,flammable=2,attached_node=1,plant=1,non_mycelium_plant=1,dig_by_water=1,destroy_by_lava_flow=1,deco_block=1}, + groups = {dig_immediate=3,flammable=2,attached_node=1,plant=1,place_flowerlike=1,non_mycelium_plant=1,dig_by_water=1,destroy_by_lava_flow=1,deco_block=1}, buildable_to = true, sounds = mcl_sounds.node_sound_leaves_defaults(), node_placement_prediction = "", @@ -226,7 +226,7 @@ local function add_large_plant(name, desc, longdesc, bottom_img, top_img, inv_im minetest.remove_node(top) end end, - groups = {dig_immediate=3,flammable=2,flower=flowergroup,non_mycelium_plant=1,attached_node=1, dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1, plant=1,double_plant=1,deco_block=1}, + groups = {dig_immediate=3,flammable=2,flower=flowergroup,place_flowerlike=1,non_mycelium_plant=1,attached_node=1, dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1, plant=1,double_plant=1,deco_block=1}, sounds = mcl_sounds.node_sound_leaves_defaults(), }) @@ -253,7 +253,7 @@ local function add_large_plant(name, desc, longdesc, bottom_img, top_img, inv_im minetest.dig_node(bottom) end end, - groups = {dig_immediate=3,flammable=2,flower=flowergroup,non_mycelium_plant=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1, not_in_creative_inventory = 1, plant=1,double_plant=2}, + groups = {dig_immediate=3,flammable=2,flower=flowergroup,place_flowerlike=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1, not_in_creative_inventory = 1, plant=1,double_plant=2}, sounds = mcl_sounds.node_sound_leaves_defaults(), })