move flowers from mapgen to flowers_plus

mods/flowerpots/nodes.lua

@@ -1,13 +1,13 @@
 
 local flowers = {
-	{"lavender", "mapgen:lavender_flower", "Lavender"},
+	{"lavender", "flowers_plus:lavender_flower", "Lavender"},
 	{"rose", "flowers:rose", "Rose"},
 	{"tulip", "flowers:tulip", "Tulip"},
 	{"geranium", "flowers:geranium", "Geranium"},
 	{"viola", "flowers:viola", "Viola"},
 	{"dandelion_yellow", "flowers:dandelion_yellow", "Yellow Dandelion"},
 	{"dandelion_white", "flowers:dandelion_white", "White Dandelion"},
-	{"flame_lily", "mapgen:flame_lily", "Flame Lily"},
+	{"flame_lily", "flowers_plus:flame_lily", "Flame Lily"},
 	{"mushroom_brown", "flowers:mushroom_brown", "Brown Mushroom"},
 	{"mushroom_red", "flowers:mushroom_red", "Red Mushroom"},
 	{"grass", "default:grass_1", "Grass"},
@@ -16,7 +16,7 @@ local flowers = {
 	{"papyrus", "default:papyrus", "Papyrus"},
 	{"small_cactus", "mapgen:small_cactus", "Small Cactus"},
 	{"small_cactus_1", "mapgen:small_cactus_1", "Small Cactus1"},
-	{"oxeye_daisy", "mapgen:oxeye_daisy", "Oxeye Daisy"},
+	{"oxeye_daisy", "flowers_plus:oxeye_daisy", "Oxeye Daisy"},
 	{"dead_grass", "mapgen:dead_grass_5", "Dead Grass"},
 	{"frozen_grass", "mapgen:snow_grass_5", "Frozen Grass"},
 	{"jungle_grass", "mapgen:jungle_grass_5", "Jungle Grass"},
@@ -26,7 +26,7 @@ local flowers = {
 	{"junglesapling", "default:junglesapling", "Jungle Sapling"},
 	{"pine_sapling", "default:pine_sapling", "Pine Sapling"},
 	{"junglegrass", "default:junglegrass", "junglegrass"},
-	{"frozen_rose", "mapgen:frozen_rose", "Frozen Rose"},
+	{"frozen_rose", "flowers_plus:frozen_rose", "Frozen Rose"},
 	{"pansy_purple", "flowers_plus:pansy_purple", "Purple Pansy"},
 	{"pansy_blue", "flowers_plus:pansy_blue", "Blue Pansy"},
 	{"petunia_blue", "flowers_plus:petunia_blue", "Blue Petunia"},

mods/flowers_plus/init.lua

@@ -36,6 +36,12 @@ add_simple_flower("petunia_blue", "Blue Petunia", {-5 / 16, -0.5, -5 / 16, 5 / 1
 add_simple_flower("petunia_pink", "Pink Petunia", {-5 / 16, -0.5, -5 / 16, 5 / 16, -1 / 16, 5 / 16}, {color_pink=1, flammable=1})
 add_simple_flower("petunia_white", "White Petunia", {-5 / 16, -0.5, -5 / 16, 5 / 16, -1 / 16, 5 / 16}, {color_white=1, flammable=1})
 add_simple_flower("lobelia", "Lobelia", {-5 / 16, -0.5, -5 / 16, 5 / 16, -1 / 16, 5 / 16}, {color_blue=1, flammable=1})
+add_simple_flower("frozen_rose", "Frozen Rose", {-5 / 16, -0.5, -5 / 16, 5 / 16, -1 / 16, 5 / 16}, {color_blue=1, flammable=0})
+add_simple_flower("lantana", "Lantana", {-5 / 16, -0.5, -5 / 16, 5 / 16, -1 / 16, 5 / 16}, {color_purple=1, flammable=1})
+add_simple_flower("lavender_flower", "Lavender", {-5 / 16, -0.5, -5 / 16, 5 / 16, -1 / 16, 5 / 16}, {color_purple=1, flammable=1})
+add_simple_flower("purple_allium", "Purple Allium", {-5 / 16, -0.5, -5 / 16, 5 / 16, -1 / 16, 5 / 16}, {color_purple=1, flammable=1})
+add_simple_flower("flame_lily", "Flame Lily", {-5 / 16, -0.5, -5 / 16, 5 / 16, -1 / 16, 5 / 16}, {color_orange=1, flammable=1})
+add_simple_flower("oxeye_daisy", "Ox Eye Daisy", {-5 / 16, -0.5, -5 / 16, 5 / 16, -1 / 16, 5 / 16}, {color_white=1, flammable=1})
 
 
 minetest.register_node("flowers_plus:foxglove", {
@@ -76,4 +82,130 @@ minetest.register_node("flowers_plus:foxglove_purple", {
 		fixed = {-0.25, -0.5, -0.25, 0.25, 0.5, 0.25}
 	},
 	walkable = false,
-})
+})
+
+minetest.register_node("flowers_plus:red_ground_flower", {
+	description = "Red Ground flower",
+	drawtype = "nodebox",
+	paramtype = "light",
+	paramtype2 = "facedir",
+	tiles = {
+		"flowers_red_ground_flower.png",
+	},
+	node_box = {
+		type = "fixed",
+		fixed = {
+		{-0.5,-0.5,-0.5,0.5,-0.49,0.5}
+		}
+	},
+	buildable_to = true,
+	groups = {snappy = 3, flammable = 1, dig_immediate = 1, flower = 1},
+	sounds = default.node_sound_leaves_defaults()
+})
+
+minetest.register_node("flowers_plus:pink_ground_flower", {
+	description = "Pink Ground flower",
+	drawtype = "nodebox",
+	paramtype = "light",
+	paramtype2 = "facedir",
+	tiles = {
+		"flowers_pink_ground_flower.png",
+	},
+	node_box = {
+		type = "fixed",
+		fixed = {
+		{-0.5,-0.5,-0.5,0.5,-0.49,0.5}
+		}
+	},
+	buildable_to = true,
+	groups = {snappy = 3, flammable = 1, dig_immediate = 1, flower = 1},
+	sounds = default.node_sound_leaves_defaults()
+})
+
+minetest.register_node("flowers_plus:blue_ground_flower", {
+	description = "Blue Ground Flower",
+	drawtype = "nodebox",
+	paramtype = "light",
+	paramtype2 = "facedir",
+	tiles = {
+		"flowers_blue_ground_flower.png",
+	},
+	node_box = {
+		type = "fixed",
+		fixed = {
+		{-0.5,-0.5,-0.5,0.5,-0.49,0.5}
+		}
+	},
+	buildable_to = true,
+	groups = {snappy = 3, flammable = 1, dig_immediate = 1, flower = 1},
+	sounds = default.node_sound_leaves_defaults()
+})
+
+function flowers_plus_decorations()
+--original mapgen mod flowers
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = "mapgen:dirt_with_junglegrass",
+	sidelen = 16,
+	fill_ratio = 0.02,
+	biomes = {"rainforest",},
+	decoration = "flowers_plus:flame_lily",
+	height = 1,
+})
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = "mapgen:dirt_with_swampgrass",
+	sidelen = 16,
+	fill_ratio = 0.02,
+	biomes = {"swamp",},
+	decoration = "flowers_plus:lavender_flower",
+	height = 1,
+})
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = "mapgen:dirt_with_leafygrass",
+	sidelen = 16,
+	fill_ratio = 0.02,
+	biomes = {"coniferous_forest_tall",},
+	decoration = "flowers_plus:purple_allium",
+	height = 1,
+})
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = "default:dirt_with_grass",
+	sidelen = 16,
+	fill_ratio = 0.04,
+	biomes = {"deciduous_forest2",},
+	decoration = "flowers_plus:lantana",
+	height = 1,
+})
+
+--new flowers
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = "default:dirt_with_grass",
+	sidelen = 16,
+	fill_ratio = 0.03,
+	biomes = {"deciduous_forest2",},
+	decoration = "flowers_plus:foxglove",
+	height = 1,
+})
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = "default:dirt_with_grass",
+	sidelen = 16,
+	fill_ratio = 0.03,
+	biomes = {"deciduous_forest",},
+	decoration = "flowers_plus:foxglove_purple",
+	height = 1,
+})
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = "default:dirt_with_snow",
+	sidelen = 16,
+	fill_ratio = 0.03,
+	biomes = {"taiga",},
+	decoration = "flowers_plus:frozen_rose",
+	height = 1,
+})
+end

mods/mapgen/depends.txt

@@ -1,4 +1,5 @@
 default
 flowers
 farming
+flowers_plus?
 fruit?

mods/mapgen/mapgen.lua

@@ -2418,31 +2418,8 @@ minetest.register_decoration({
 	height = 1,
 })
 
-	--purple allium
-	
-	
-minetest.register_decoration({
-	deco_type = "simple",
-	place_on = "mapgen:dirt_with_leafygrass",
-	sidelen = 16,
-	fill_ratio = 0.02,
-	biomes = {"coniferous_forest_tall",},
-	decoration = "mapgen:purple_allium",
-	height = 1,
-})
-
 --deciduous_forest2 stuff
 
-minetest.register_decoration({
-	deco_type = "simple",
-	place_on = "default:dirt_with_grass",
-	sidelen = 16,
-	fill_ratio = 0.05,
-	biomes = {"deciduous_forest2",},
-	decoration = "mapgen:lantana",
-	height = 1,
-})
-
 minetest.register_decoration({
 	deco_type = "simple",
 	place_on = "default:dirt_with_grass",
@@ -2535,26 +2512,6 @@ minetest.register_decoration({
 	height = 1,
 })
 
-minetest.register_decoration({
-	deco_type = "simple",
-	place_on = "mapgen:dirt_with_junglegrass",
-	sidelen = 16,
-	fill_ratio = 0.02,
-	biomes = {"rainforest",},
-	decoration = "mapgen:flame_lily",
-	height = 1,
-})
-
-minetest.register_decoration({
-	deco_type = "simple",
-	place_on = "mapgen:dirt_with_swampgrass",
-	sidelen = 16,
-	fill_ratio = 0.02,
-	biomes = {"swamp",},
-	decoration = "mapgen:lavender_flower",
-	height = 1,
-})
-
 minetest.register_decoration({
 	deco_type = "simple",
 	place_on = "mapgen:dirt_with_junglegrass",
@@ -2971,6 +2928,10 @@ if minetest.get_modpath("fruit") then
 fruit.register_ores()
 end
 
+if minetest.get_modpath("flowers_plus") then
+flowers_plus_decorations()
+end
+
 if minetest.get_mapgen_params().mgname == "v6" then
 	farming.register_mgv6_decorations()
 	flowers.register_mgv6_decorations()

mods/mapgen/nodes.lua

@@ -180,63 +180,6 @@ minetest.override_item("flowers:waterlily", {
 	end
 })
 
-minetest.register_node("mapgen:red_ground_flower", {
-	description = "Red Ground flower",
-	drawtype = "nodebox",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	tiles = {
-		"mapgen_red_ground_flower.png",
-	},
-	node_box = {
-		type = "fixed",
-		fixed = {
-		{-0.5,-0.5,-0.5,0.5,-0.49,0.5}
-		}
-	},
-	buildable_to = true,
-	groups = {snappy = 3, flammable = 1, dig_immediate = 1, flower = 1},
-	sounds = default.node_sound_leaves_defaults()
-})
-
-minetest.register_node("mapgen:pink_ground_flower", {
-	description = "Pink Ground flower",
-	drawtype = "nodebox",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	tiles = {
-		"mapgen_pink_ground_flower.png",
-	},
-	node_box = {
-		type = "fixed",
-		fixed = {
-		{-0.5,-0.5,-0.5,0.5,-0.49,0.5}
-		}
-	},
-	buildable_to = true,
-	groups = {snappy = 3, flammable = 1, dig_immediate = 1, flower = 1},
-	sounds = default.node_sound_leaves_defaults()
-})
-
-minetest.register_node("mapgen:blue_ground_flower", {
-	description = "Blue Ground Flower",
-	drawtype = "nodebox",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	tiles = {
-		"mapgen_blue_ground_flower.png",
-	},
-	node_box = {
-		type = "fixed",
-		fixed = {
-		{-0.5,-0.5,-0.5,0.5,-0.49,0.5}
-		}
-	},
-	buildable_to = true,
-	groups = {snappy = 3, flammable = 1, dig_immediate = 1, flower = 1},
-	sounds = default.node_sound_leaves_defaults()
-})
-
 minetest.register_node("mapgen:dicksonia", {
 	description = "Dicksonia",
 	drawtype = "mesh",
@@ -445,26 +388,6 @@ minetest.register_node("mapgen:dirt_with_junglegrass", {
 	sounds = default.node_sound_dirt_defaults()
 })
 
-minetest.register_node("mapgen:lantana", {
-	description = "Lantana",
-	drawtype = "plantlike",
-	tiles = {
-		"mapgen_lantana.png",
-	},
-	groups = {snappy=3, flammable=1, flora=1},
-	sounds = default.node_sound_leaves_defaults(),
-	is_ground_content=true,
-	buildable_to = true, 
-	walkable = false,
-	inventory_image = "mapgen_lantana.png",
-	paramtype = "light",
-	sunlight_propagates=true,
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.1, 0.5}
-	},
-})
-
 minetest.register_node("mapgen:creeper", {
 	description = "Creeper",
 	drawtype = "firelike",
@@ -902,42 +825,6 @@ minetest.register_node("mapgen:bamboo_wood", {
 	sounds = default.node_sound_stone_defaults(),
 })
 
-minetest.register_node("mapgen:flame_lily", {
-	description = "Flame Lily",
-	drawtype = "plantlike",
-	tiles = {"mapgen_flame_lily.png"},
-	paramtype = "light",
-	is_ground_content = false,
-	buildable_to = true, 
-	sunlight_propagates = true,
-	inventory_image = "mapgen_flame_lily.png",
-	groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
-	sounds = default.node_sound_leaves_defaults(),
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3}
-	},
-	walkable = false,
-})
-
-minetest.register_node("mapgen:frozen_rose", {
-	description = "Frozen Rose",
-	drawtype = "plantlike",
-	tiles = {"mapgen_frozen_rose.png"},
-	paramtype = "light",
-	is_ground_content = false,
-	buildable_to = true, 
-	sunlight_propagates = true,
-	inventory_image = "mapgen_frozen_rose.png",
-	groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
-	sounds = default.node_sound_leaves_defaults(),
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3}
-	},
-	walkable = false,
-})
-
 minetest.register_node("mapgen:jungle_grass_1", {
 	description = "Jungle Grass",
 	drawtype = "plantlike",
@@ -1309,42 +1196,6 @@ minetest.register_node("mapgen:cattail", {
 	walkable = false,
 })
 
-minetest.register_node("mapgen:lavender_flower", {
-	description = "Lavender Flower",
-	drawtype = "plantlike",
-	tiles = {"mapgen_lavender_flower.png"},
-	paramtype = "light",
-	is_ground_content = false,
-	buildable_to = true, 
-	sunlight_propagates = true,
-	inventory_image = "mapgen_lavender_flower.png",
-	groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
-	sounds = default.node_sound_leaves_defaults(),
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}
-	},
-	walkable = false,
-})
-
-minetest.register_node("mapgen:oxeye_daisy", {
-	description = "Oxeye Daisy",
-	drawtype = "plantlike",
-	tiles = {"mapgen_oxeye_daisy.png"},
-	paramtype = "light",
-	is_ground_content = false,
-	buildable_to = true, 
-	sunlight_propagates = true,
-	inventory_image = "mapgen_oxeye_daisy.png",
-	groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
-	sounds = default.node_sound_leaves_defaults(),
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}
-	},
-	walkable = false,
-})
-
 minetest.register_node("mapgen:small_cactus", {
 	description = "Small Cactus",
 	drawtype = "plantlike",
@@ -1381,24 +1232,6 @@ minetest.register_node("mapgen:small_cactus_1", {
 	walkable = false,
 })
 
-minetest.register_node("mapgen:purple_allium", {
-	description = "Purple Allium",
-	drawtype = "plantlike",
-	tiles = {"mapgen_purple_allium.png"},
-	paramtype = "light",
-	is_ground_content = false,
-	buildable_to = true, 
-	sunlight_propagates = true,
-	inventory_image = "mapgen_purple_allium.png",
-	groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
-	sounds = default.node_sound_leaves_defaults(),
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}
-	},
-	walkable = false,
-})
-
 minetest.register_node("mapgen:wild_oat", {
 	description = "Wild Oat",
 	drawtype = "plantlike",