Remove mushrooms from flowers, replace with mod. Cleanup flowers code.

mods/ITEMS/flowers/init.lua

@@ -1,5 +1,6 @@
--- Minetest 0.4 mod: default
--- See README.txt for licensing and other information.
+--[[
+	Flowers
+--]]
 
 
 -- Namespace for functions
@@ -7,25 +8,6 @@
 flowers = {}
 
 
--- Map Generation
-
-dofile(minetest.get_modpath("flowers") .. "/mapgen.lua")
-
-
---
--- Flowers
---
-
--- Aliases for original flowers mod
-
-minetest.register_alias("flowers:flower_rose", "flowers:rose")
-minetest.register_alias("flowers:flower_tulip", "flowers:tulip")
-minetest.register_alias("flowers:flower_dandelion_yellow", "flowers:dandelion_yellow")
-minetest.register_alias("flowers:flower_geranium", "flowers:geranium")
-minetest.register_alias("flowers:flower_viola", "flowers:viola")
-minetest.register_alias("flowers:flower_dandelion_white", "flowers:dandelion_white")
-
-
 -- Flower registration
 
 local function add_simple_flower(name, desc, box, f_groups)
@@ -159,96 +141,6 @@ minetest.register_abm({
 })
 
 
---
--- Mushrooms
---
-
-minetest.register_node("flowers:mushroom_red", {
-	description = "Red Mushroom",
-	tiles = {"flowers_mushroom_red.png"},
-	inventory_image = "flowers_mushroom_red.png",
-	wield_image = "flowers_mushroom_red.png",
-	drawtype = "plantlike",
-	paramtype = "light",
-	sunlight_propagates = true,
-	walkable = false,
-	buildable_to = true,
-	groups = {snappy = 3, attached_node = 1, flammable = 1},
-	sounds = default.node_sound_leaves_defaults(),
-	on_use = minetest.item_eat(-5),
-	selection_box = {
-		type = "fixed",
-		fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, -1 / 16, 4 / 16},
-	}
-})
-
-minetest.register_node("flowers:mushroom_brown", {
-	description = "Brown Mushroom",
-	tiles = {"flowers_mushroom_brown.png"},
-	inventory_image = "flowers_mushroom_brown.png",
-	wield_image = "flowers_mushroom_brown.png",
-	drawtype = "plantlike",
-	paramtype = "light",
-	sunlight_propagates = true,
-	walkable = false,
-	buildable_to = true,
-	groups = {snappy = 3, attached_node = 1, flammable = 1},
-	sounds = default.node_sound_leaves_defaults(),
-	on_use = minetest.item_eat(1),
-	selection_box = {
-		type = "fixed",
-		fixed = {-3 / 16, -0.5, -3 / 16, 3 / 16, -2 / 16, 3 / 16},
-	}
-})
-
-
--- Mushroom spread and death
-
-minetest.register_abm({
-	label = "Mushroom spread",
-	nodenames = {"flowers:mushroom_brown", "flowers:mushroom_red"},
-	interval = 11,
-	chance = 50,
-	action = function(pos, node)
-		if minetest.get_node_light(pos, nil) == 15 then
-			minetest.remove_node(pos)
-			return
-		end
-		local random = {
-			x = pos.x + math.random(-2, 2),
-			y = pos.y + math.random(-1, 1),
-			z = pos.z + math.random(-2, 2)
-		}
-		local random_node = minetest.get_node_or_nil(random)
-		if not random_node or random_node.name ~= "air" then
-			return
-		end
-		local node_under = minetest.get_node_or_nil({x = random.x,
-			y = random.y - 1, z = random.z})
-		if not node_under then
-			return
-		end
-
-		if (minetest.get_item_group(node_under.name, "soil") ~= 0 or
-				minetest.get_item_group(node_under.name, "tree") ~= 0) and
-				minetest.get_node_light(pos, 0.5) <= 3 and
-				minetest.get_node_light(random, 0.5) <= 3 then
-			minetest.set_node(random, {name = node.name})
-		end
-	end
-})
-
-
--- These old mushroom related nodes can be simplified now
-
-minetest.register_alias("flowers:mushroom_spores_brown", "flowers:mushroom_brown")
-minetest.register_alias("flowers:mushroom_spores_red", "flowers:mushroom_red")
-minetest.register_alias("flowers:mushroom_fertile_brown", "flowers:mushroom_brown")
-minetest.register_alias("flowers:mushroom_fertile_red", "flowers:mushroom_red")
-minetest.register_alias("mushroom:brown_natural", "flowers:mushroom_brown")
-minetest.register_alias("mushroom:red_natural", "flowers:mushroom_red")
-
-
 --
 -- Waterlily
 --

mods/ITEMS/flowers/mapgen.lua

@@ -1,171 +0,0 @@
---
--- Mgv6
---
-
-local function register_mgv6_flower(name)
-	minetest.register_decoration({
-		deco_type = "simple",
-		place_on = {"default:dirt_with_grass"},
-		sidelen = 16,
-		noise_params = {
-			offset = 0,
-			scale = 0.006,
-			spread = {x = 100, y = 100, z = 100},
-			seed = 436,
-			octaves = 3,
-			persist = 0.6
-		},
-		y_min = 1,
-		y_max = 30,
-		decoration = "flowers:"..name,
-	})
-end
-
-local function register_mgv6_mushroom(name)
-	minetest.register_decoration({
-		deco_type = "simple",
-		place_on = {"default:dirt_with_grass"},
-		sidelen = 16,
-		noise_params = {
-			offset = 0,
-			scale = 0.04,
-			spread = {x = 100, y = 100, z = 100},
-			seed = 7133,
-			octaves = 3,
-			persist = 0.6
-		},
-		y_min = 1,
-		y_max = 30,
-		decoration = "flowers:"..name,
-		spawn_by = "default:tree",
-		num_spawn_by = 1,
-	})
-end
-
-local function register_mgv6_waterlily()
-	minetest.register_decoration({
-		deco_type = "schematic",
-		place_on = {"default:dirt"},
-		sidelen = 16,
-		noise_params = {
-			offset = -0.12,
-			scale = 0.3,
-			spread = {x = 100, y = 100, z = 100},
-			seed = 33,
-			octaves = 3,
-			persist = 0.7
-		},
-		y_min = 0,
-		y_max = 0,
-		schematic = minetest.get_modpath("flowers").."/schematics/waterlily.mts",
-		rotation = "random",
-	})
-end
-
-function flowers.register_mgv6_decorations()
-	register_mgv6_flower("rose")
-	register_mgv6_flower("tulip")
-	register_mgv6_flower("dandelion_yellow")
-	register_mgv6_flower("geranium")
-	register_mgv6_flower("viola")
-	register_mgv6_flower("dandelion_white")
-
-	register_mgv6_mushroom("mushroom_brown")
-	register_mgv6_mushroom("mushroom_red")
-
-	register_mgv6_waterlily()
-end
-
-
---
--- All other biome API mapgens
---
-
-local function register_flower(seed, name)
-	minetest.register_decoration({
-		deco_type = "simple",
-		place_on = {"default:dirt_with_grass"},
-		sidelen = 16,
-		noise_params = {
-			offset = -0.015,
-			scale = 0.025,
-			spread = {x = 200, y = 200, z = 200},
-			seed = seed,
-			octaves = 3,
-			persist = 0.6
-		},
-		biomes = {"grassland", "deciduous_forest", "coniferous_forest",
-			"floatland_grassland", "floatland_coniferous_forest"},
-		y_min = 1,
-		y_max = 31000,
-		decoration = "flowers:"..name,
-	})
-end
-
-local function register_mushroom(name)
-	minetest.register_decoration({
-		deco_type = "simple",
-		place_on = {"default:dirt_with_grass"},
-		sidelen = 16,
-		noise_params = {
-			offset = 0,
-			scale = 0.006,
-			spread = {x = 250, y = 250, z = 250},
-			seed = 2,
-			octaves = 3,
-			persist = 0.66
-		},
-		biomes = {"deciduous_forest", "coniferous_forest",
-			"floatland_coniferous_forest"},
-		y_min = 1,
-		y_max = 31000,
-		decoration = "flowers:"..name,
-	})
-end
-
-local function register_waterlily()
-	minetest.register_decoration({
-		deco_type = "schematic",
-		place_on = {"default:dirt"},
-		sidelen = 16,
-		noise_params = {
-			offset = -0.12,
-			scale = 0.3,
-			spread = {x = 200, y = 200, z = 200},
-			seed = 33,
-			octaves = 3,
-			persist = 0.7
-		},
-		biomes = {"rainforest_swamp", "savanna_shore", "deciduous_forest_shore"},
-		y_min = 0,
-		y_max = 0,
-		schematic = minetest.get_modpath("flowers") .. "/schematics/waterlily.mts",
-		rotation = "random",
-	})
-end
-
-function flowers.register_decorations()
-	register_flower(436,     "rose")
-	register_flower(19822,   "tulip")
-	register_flower(1220999, "dandelion_yellow")
-	register_flower(36662,   "geranium")
-	register_flower(1133,    "viola")
-	register_flower(73133,   "dandelion_white")
-
-	register_mushroom("mushroom_brown")
-	register_mushroom("mushroom_red")
-
-	register_waterlily()
-end
-
-
---
--- Detect mapgen to select functions
---
-
-local mg_name = minetest.get_mapgen_setting("mg_name")
-if mg_name == "v6" then
-	flowers.register_mgv6_decorations()
-else
-	flowers.register_decorations()
-end

mods/ITEMS/mushrooms/depends.txt

@@ -0,0 +1 @@
+default

mods/ITEMS/mushrooms/init.lua

@@ -0,0 +1,79 @@
+--[[
+	Mushrooms
+--]]
+
+minetest.register_node("mushrooms:mushroom_red", {
+	description = "Red Mushroom",
+	tiles = {"mushrooms_mushroom_red.png"},
+	inventory_image = "mushrooms_mushroom_red.png",
+	wield_image = "mushrooms_mushroom_red.png",
+	drawtype = "plantlike",
+	paramtype = "light",
+	sunlight_propagates = true,
+	walkable = false,
+	buildable_to = true,
+	groups = {snappy = 3, attached_node = 1, flammable = 1},
+	sounds = default.node_sound_leaves_defaults(),
+	on_use = minetest.item_eat(-5),
+	selection_box = {
+		type = "fixed",
+		fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, -1 / 16, 4 / 16},
+	}
+})
+
+minetest.register_node("mushrooms:mushroom_brown", {
+	description = "Brown Mushroom",
+	tiles = {"mushrooms_mushroom_brown.png"},
+	inventory_image = "mushrooms_mushroom_brown.png",
+	wield_image = "mushrooms_mushroom_brown.png",
+	drawtype = "plantlike",
+	paramtype = "light",
+	sunlight_propagates = true,
+	walkable = false,
+	buildable_to = true,
+	groups = {snappy = 3, attached_node = 1, flammable = 1},
+	sounds = default.node_sound_leaves_defaults(),
+	on_use = minetest.item_eat(1),
+	selection_box = {
+		type = "fixed",
+		fixed = {-3 / 16, -0.5, -3 / 16, 3 / 16, -2 / 16, 3 / 16},
+	}
+})
+
+
+-- Mushroom spread and death
+
+minetest.register_abm({
+	label = "Mushroom spread",
+	nodenames = {"mushrooms:mushroom_brown", "mushrooms:mushroom_red"},
+	interval = 11,
+	chance = 50,
+	action = function(pos, node)
+		if minetest.get_node_light(pos, nil) == 15 then
+			minetest.remove_node(pos)
+			return
+		end
+		local random = {
+			x = pos.x + math.random(-2, 2),
+			y = pos.y + math.random(-1, 1),
+			z = pos.z + math.random(-2, 2)
+		}
+		local random_node = minetest.get_node_or_nil(random)
+		if not random_node or random_node.name ~= "air" then
+			return
+		end
+		local node_under = minetest.get_node_or_nil({x = random.x,
+			y = random.y - 1, z = random.z})
+		if not node_under then
+			return
+		end
+
+		if (minetest.get_item_group(node_under.name, "soil") ~= 0 or
+				minetest.get_item_group(node_under.name, "tree") ~= 0) and
+				minetest.get_node_light(pos, 0.5) <= 3 and
+				minetest.get_node_light(random, 0.5) <= 3 then
+			minetest.set_node(random, {name = node.name})
+		end
+	end
+})
+

mods/ITEMS/mushrooms/mod.conf

@@ -0,0 +1 @@
+name = mushrooms