From 8fc57f7746a55a65fb36e87861fc00def7cb8b47 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sat, 20 Feb 2021 15:33:03 +0000 Subject: [PATCH 1/2] tweak flower addition to wait until mods loaded --- init.lua | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/init.lua b/init.lua index 6f28922..b27e66f 100644 --- a/init.lua +++ b/init.lua @@ -63,24 +63,19 @@ local dry_grass = { "default:dry_grass_5", "", "" } --- add all in-game flowers except waterlily +-- loads mods then add all in-game flowers except waterlily local flowers = {} -for node, def in pairs(minetest.registered_nodes) do +minetest.after(0.1, function() - if def.groups.flower and not node:find("waterlily") then - flowers[#flowers + 1] = node + for node, def in pairs(minetest.registered_nodes) do + + if def.groups.flower and not node:find("waterlily") then + flowers[#flowers + 1] = node + end end -end +end) --- add additional bakedclay flowers if enabled -if minetest.get_modpath("bakedclay") then - flowers[#flowers + 1] = "bakedclay:delphinium" - flowers[#flowers + 1] = "bakedclay:thistle" - flowers[#flowers + 1] = "bakedclay:lazarus" - flowers[#flowers + 1] = "bakedclay:mannagrass" - flowers[#flowers + 1] = "" -end -- default biomes deco local deco = { From 634d1496aa70a25c56ad5a7bde13e5fb354eb26a Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sat, 20 Feb 2021 15:52:36 +0000 Subject: [PATCH 2/2] ignore xdecor's flowerpots when adding flowers --- init.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/init.lua b/init.lua index b27e66f..71cff14 100644 --- a/init.lua +++ b/init.lua @@ -70,7 +70,10 @@ minetest.after(0.1, function() for node, def in pairs(minetest.registered_nodes) do - if def.groups.flower and not node:find("waterlily") then + if def.groups + and def.groups.flower + and not node:find("waterlily") + and not node:find("xdecor:potted_") then flowers[#flowers + 1] = node end end