make schematic decoration easier to read

decor.lua

@@ -257,7 +257,7 @@ register_decoration(1, {
 
 register_decoration(ethereal.sakura, {
 	place_on = {"ethereal:bamboo_dirt"},
-	fill_ratio = 0.25,
+	fill_ratio = 0.025,
 	biomes = {"sakura"},
 	decoration = "ethereal:lilac"})
 

schems.lua

@@ -31,311 +31,340 @@ dofile(path .. "lemon_tree.lua")
 dofile(path .. "olive_tree.lua")
 dofile(path .. "basandra_bush.lua")
 
--- add chematic helper function
+-- register decoration helper
 
-local function add_schem(a, b, c, d, e, f, g, h, i, j, k)
+local function register_decoration(enabled, def)
 
-	if g ~= 1 then return end -- add if setting is 1
+	if enabled ~= 1 then return end
 
-	minetest.register_decoration({
+	def.sidelen = def.sidelen or 80 -- some handy defaults
-		deco_type = "schematic",
+	def.deco_type = "schematic"
-		place_on = a,
+	def.y_min = def.y_min or 1
-		sidelen = 80,
+	def.y_max = def.y_max or 100
-		fill_ratio = b,
+	def.flags = def.flags or "place_center_x, place_center_z"
-		biomes = c,
+
-		y_min = d,
+	minetest.register_decoration(def)
-		y_max = e,
-		schematic = f,
-		flags = "place_center_x, place_center_z",
-		replacements = h,
-		spawn_by = i,
-		num_spawn_by = j,
-		rotation = k
-	})
 end
 
 -- igloo
 
-add_schem("default:snowblock", 0.0005, {"glacier"}, 3, 50,
+register_decoration(ethereal.glacier, {
-	ethereal.igloo, ethereal.glacier, nil, "default:snowblock", 8, "random")
+	place_on = "default:snowblock",
+	fill_ratio = 0.0005,
+	biomes = {"glacier"},
+	y_min = 3, y_max = 50,
+	schematic = ethereal.igloo,
+	spawn_by = "default:snowblock", num_spawn_by = 8,
+	rotation = "random"})
 
 -- sakura tree
 
-add_schem({"ethereal:bamboo_dirt"}, 0.001, {"sakura"}, 7, 100,
+register_decoration(ethereal.sakura, {
-	ethereal.sakura_tree, ethereal.sakura, nil,
+	place_on = "ethereal:bamboo_dirt",
-	"ethereal:bamboo_dirt", 6)
+	fill_ratio = 0.001,
+	biomes = {"sakura"},
+	y_min = 7, y_max = 100,
+	schematic = ethereal.sakura_tree,
+	spawn_by = "ethereal:bamboo_dirt", num_spawn_by = 6})
 
 -- redwood tree
 
-add_schem({"default:dirt_with_dry_grass"}, 0.0025, {"mesa"}, 1, 100,
+register_decoration(ethereal.mesa, {
-	ethereal.redwood_tree, ethereal.mesa, nil,
+	place_on = "default:dirt_with_dry_grass",
-	"default:dirt_with_dry_grass", 8)
+	fill_ratio = 0.0025,
+	biomes = {"mesa"},
+	schematic = ethereal.redwood_tree,
+	flags = "place_center_x, place_center_z",
+	spawn_by = "default:dirt_with_dry_grass", num_spawn_by = 8})
 
 -- banana tree
 
-add_schem({"ethereal:grove_dirt"}, 0.015, {"grove"}, 1, 100,
+register_decoration(ethereal.grove, {
-	ethereal.bananatree, ethereal.grove)
+	place_on = "ethereal:grove_dirt",
+	fill_ratio = 0.015,
+	biomes = {"grove"},
+	schematic = ethereal.bananatree})
 
 -- healing tree
 
-add_schem({"default:dirt_with_snow"}, 0.01, {"taiga"}, 120, 140,
+register_decoration(ethereal.alpine, {
-	ethereal.yellowtree, ethereal.alpine, nil, "default:dirt_with_snow", 8)
+	place_on = "default:dirt_with_snow",
+	fill_ratio = 0.01,
+	biomes = {"taiga"},
+	y_min = 120, y_max = 140,
+	schematic = ethereal.yellowtree,
+	spawn_by = "default:dirt_with_snow", num_spawn_by = 8})
 
 -- crystal frost tree
 
-add_schem({"ethereal:crystal_dirt"}, 0.01, {"frost", "frost_floatland"}, 1, 1750,
+register_decoration(ethereal.frost, {
-	ethereal.frosttrees, ethereal.frost, nil,
+	place_on = "ethereal:crystal_dirt",
-	"ethereal:crystal_dirt", 8)
+	fill_ratio = 0.01,
+	biomes = {"frost", "frost_floatland"},
+	y_min = 1, y_max = 1750,
+	schematic = ethereal.frosttrees,
+	spawn_by = "ethereal:crystal_dirt", num_spawn_by = 8})
 
--- giant mushroom
+-- giant red mushroom
 
-add_schem("ethereal:mushroom_dirt", 0.02, {"mushroom"}, 3, 25,
+register_decoration(ethereal.mushroom, {
-	ethereal.mushroomone, ethereal.mushroom, nil,
+	place_on = "ethereal:mushroom_dirt",
-	"ethereal:mushroom_dirt", 8)
+	fill_ratio = 0.02,
+	biomes = {"mushroom"},
+	y_min = 3, y_max = 25,
+	schematic = ethereal.mushroomone,
+	spawn_by = "ethereal:mushroom_dirt", num_spawn_by = 8})
 
 -- giant brown mushroom
 
-add_schem("ethereal:mushroom_dirt", 0.02, {"mushroom"}, 26, 50,
+register_decoration(ethereal.mushroom, {
-	ethereal.mushroomtwo, ethereal.mushroom, nil, nil, nil, "random")
+	place_on = "ethereal:mushroom_dirt",
+	fill_ratio = 0.02,
+	biomes = {"mushroom"},
+	y_min = 26, y_max = 50,
+	schematic = ethereal.mushroomtwo,
+	rotation = "random"})
 
 -- small lava crater
 
-add_schem("ethereal:fiery_dirt", 0.01, {"fiery"}, 1, 100,
+register_decoration(ethereal.fiery, {
-	ethereal.volcanom, ethereal.fiery, nil, "ethereal:fiery_dirt", 8)
+	place_on = "ethereal:fiery_dirt",
+	fill_ratio = 0.01,
+	biomes = {"fiery"},
+	schematic = ethereal.volcanom,
+	spawn_by = "ethereal:fiery_dirt", num_spawn_by = 6})
 
 -- large lava crater
 
-add_schem("ethereal:fiery_dirt", 0.003, {"fiery"}, 1, 100,
+register_decoration(ethereal.fiery, {
-	ethereal.volcanol, ethereal.fiery, nil, "ethereal:fiery_dirt", 8, "random")
+	place_on = "ethereal:fiery_dirt",
+	fill_ratio = 0.003,
+	biomes = {"fiery"},
+	schematic = ethereal.volcanol,
+	spawn_by = "ethereal:fiery_dirt", num_spawn_by = 8,
+	rotation = "random"})
 
 -- basandra bush
 
-add_schem("ethereal:fiery_dirt", 0.03, {"fiery"}, 1, 100,
+register_decoration(ethereal.fiery, {
-	ethereal.basandrabush, ethereal.fiery)
+	place_on = "ethereal:fiery_dirt",
+	fill_ratio = 0.03,
+	biomes = {"fiery"},
+	schematic = ethereal.basandrabush})
 
 -- default jungle tree
 
-add_schem({"ethereal:jungle_dirt", "default:dirt_with_rainforest_litter"},
+register_decoration(ethereal.junglee, {
-	0.08, {"junglee"}, 1, 100, dpath .. "jungle_tree.mts", ethereal.junglee)
+	place_on = "default:dirt_with_rainforest_litter",
+	fill_ratio = 0.08,
+	biomes = {"junglee"},
+	schematic = dpath .. "jungle_tree.mts"})
 
 -- willow tree
 
-add_schem({"ethereal:gray_dirt"}, 0.02, {"grayness"}, 1, 100,
+register_decoration(ethereal.grayness, {
-	ethereal.willow, ethereal.grayness, nil, "ethereal:gray_dirt", 6)
+	place_on = "ethereal:gray_dirt",
+	fill_ratio = 0.02,
+	biomes = {"grayness"},
+	schematic = ethereal.willow,
+	spawn_by = "ethereal:gray_dirt", num_spawn_by = 6})
 
 -- default large pine tree for lower elevation
 
-add_schem({"ethereal:cold_dirt", "default:dirt_with_coniferous_litter"},
+register_decoration(ethereal.snowy, {
-	0.025, {"coniferous_forest"}, 10, 40, dpath .. "pine_tree.mts", ethereal.snowy)
+	place_on = "ethereal:dirt_with_coniferous_litter",
+	fill_ratio = 0.025,
+	biomes = {"coniferous_forest"},
+	y_min = 10, y_max = 40,
+	schematic = dpath .. "pine_tree.mts"})
 
 -- small pine for higher elevation
 
-add_schem({"default:dirt_with_snow"}, 0.025, {"taiga"}, 40, 140,
+register_decoration(ethereal.alpine, {
-	ethereal.pinetree, ethereal.alpine)
+	place_on = {"default:dirt_with_snow"},
+	fill_ratio = 0.025,
+	biomes = {"taiga"},
+	y_min = 40, y_max = 140,
+	schematic = ethereal.pinetree})
 
 -- default apple tree
 
-add_schem({"default:dirt_with_grass"}, 0.025, {"jumble", "deciduous_forest"}, 1, 100,
+register_decoration(ethereal.grassy, {
-	dpath .. "apple_tree.mts", ethereal.grassy)
+	place_on = "default:dirt_with_grass",
+	fill_ratio = 0.025,
+	biomes = {"jumble", "deciduous_forest"},
+	schematic = dpath .. "apple_tree.mts"})
 
 -- big old tree
 
-add_schem({"default:dirt_with_grass"}, 0.001, {"jumble"}, 1, 100,
+register_decoration(ethereal.jumble, {
-	ethereal.bigtree, ethereal.jumble, nil, "default:dirt_with_grass", 8)
+	place_on = "default:dirt_with_grass",
+	fill_ratio = 0.001,
+	biomes = {"jumble"},
+	schematic = ethereal.bigtree,
+	spawn_by = "default:dirt_with_grass", num_spawn_by = 8})
 
 -- default aspen tree
 
-add_schem({"default:dirt_with_grass"}, 0.02, {"grassytwo"}, 1, 50,
+register_decoration(ethereal.grassytwo, {
-	dpath .. "aspen_tree.mts", ethereal.jumble)
+	place_on = "default:dirt_with_grass",
+	fill_ratio = 0.02,
+	biomes = {"grassytwo"},
+	y_min = 1, y_max = 50,
+	schematic = dpath .. "aspen_tree.mts"})
 
 -- birch tree
 
-add_schem({"default:dirt_with_grass"}, 0.02, {"grassytwo"}, 50, 100,
+register_decoration(ethereal.grassytwo, {
-	ethereal.birchtree, ethereal.grassytwo)
+	place_on = "default:dirt_with_grass",
+	fill_ratio = 0.02,
+	biomes = {"grassytwo"},
+	y_min = 50, y_max = 100,
+	schematic = ethereal.birchtree})
 
 -- orange tree
 
-add_schem({"ethereal:prairie_dirt"}, 0.01, {"prairie"}, 1, 100,
+register_decoration(ethereal.prairie, {
-	ethereal.orangetree, ethereal.prairie)
+	place_on = "ethereal:prairie_dirt",
+	fill_ratio = 0.01,
+	biomes = {"prairie"},
+	schematic = ethereal.orangetree})
 
 -- default acacia tree
 
-add_schem({"default:dry_dirt_with_dry_grass",
+register_decoration(ethereal.savanna, {
-	"default:dirt_with_dry_grass"}, 0.004, {"savanna"}, 1, 100,
+	place_on = {"default:dry_dirt_with_dry_grass", "default:dirt_with_dry_grass"},
-	dpath .. "acacia_tree.mts", ethereal.savanna)
+	fill_ratio = 0.004,
+	biomes = {"savanna"},
+	schematic = dpath .. "acacia_tree.mts"})
 
 -- palm tree
 
-add_schem("default:sand", 0.0025, {"desert_ocean", "plains_ocean", "sandclay",
+register_decoration(1, {
-	"sandstone_ocean", "mesa_ocean", "grove_ocean", "deciduous_forest_ocean"}, 1, 1,
+	place_on = "default:sand",
-	ethereal.palmtree, 1)
+	fill_ratio = 0.0025,
+	biomes = {"desert_ocean", "plains_ocean", "sandclay", "sandstone_ocean",
+			"mesa_ocean", "grove_ocean", "deciduous_forest_ocean"},
+	y_min = 1, y_max = 1,
+	schematic = ethereal.palmtree})
 
 -- bamboo tree
 
-add_schem({"ethereal:bamboo_dirt"}, 0.025, {"bamboo"}, 1, 100,
+register_decoration(ethereal.bamboo, {
-	ethereal.bambootree, ethereal.bamboo)
+	place_on = "ethereal:bamboo_dirt",
+	fill_ratio = 0.025,
+	biomes = {"bamboo"},
+	schematic = ethereal.bambootree})
 
 -- bush
 
-add_schem({"ethereal:bamboo_dirt"}, 0.08, {"bamboo"}, 1, 100, ethereal.bush,
+register_decoration(ethereal.bamboo, {
-	ethereal.bamboo)
+	place_on = "ethereal:bamboo_dirt",
+	fill_ratio = 0.08,
+	biomes = {"bamboo"},
+	schematic = ethereal.bush,
+	spawn_by = "ethereal:bamboo_dirt", num_spawn_by = 6})
 
 -- vine tree
 
-add_schem({"default:dirt_with_grass"}, 0.02, {"swamp"}, 1, 100,
+register_decoration(ethereal.swamp, {
-	ethereal.vinetree, ethereal.swamp)
+	place_on = "default:dirt_with_grass",
+	fill_ratio = 0.02,
+	biomes = {"swamp"},
+	schematic = ethereal.vinetree})
 
 -- lemon tree
 
-add_schem({"ethereal:grove_dirt"}, 0.002, {"mediterranean"}, 5, 50,
+register_decoration(ethereal.mediterranean, {
-	ethereal.lemontree, ethereal.mediterranean)
+	place_on = "ethereal:grove_dirt",
+	fill_ratio = 0.002,
+	biomes = {"mediterranean"},
+	y_min = 5, y_max = 50,
+	schematic = ethereal.lemontree})
 
 -- olive tree
 
-add_schem({"ethereal:grove_dirt"}, 0.002, {"mediterranean"}, 5, 35,
+register_decoration(ethereal.mediterranean, {
-	ethereal.olivetree, ethereal.mediterranean)
+	place_on = "ethereal:grove_dirt",
+	fill_ratio = 0.002,
+	biomes = {"mediterranean"},
+	y_min = 5, y_max = 35,
+	schematic = ethereal.olivetree})
 
 -- default large cactus
 
-if ethereal.desert == 1 then
+register_decoration(ethereal.desert, {
-
+	place_on = {"default:desert_sand"},
-	minetest.register_decoration({
+	noise_params = {
-		deco_type = "schematic",
+		offset = -0.0005, scale = 0.0015, spread = {x = 200, y = 200, z = 200},
-		place_on = {"default:desert_sand"},
+		seed = 230, octaves = 3, persist = 0.6},
-		sidelen = 80,
+	biomes = {"desert"},
-		noise_params = {
+	y_min = 5, y_max = 100,
-			offset = -0.0005,
+	schematic = dpath .. "large_cactus.mts",
-			scale = 0.0015,
+	flags = "place_center_x",
-			spread = {x = 200, y = 200, z = 200},
+	rotation = "random"})
-			seed = 230,
-			octaves = 3,
-			persist = 0.6
-		},
-		biomes = {"desert"},
-		y_min = 5,
-		y_max = 31000,
-		schematic = dpath .. "large_cactus.mts",
-		flags = "place_center_x",
-		rotation = "random",
-	})
-end
 
 -- default bush
 
-minetest.register_decoration({
+register_decoration(1, {
-	deco_type = "schematic",
 	place_on = {"default:dirt_with_grass", "default:dirt_with_snow"},
 	sidelen = 16,
 	noise_params = {
-		offset = -0.004,
+		offset = -0.004, scale = 0.01, spread = {x = 100, y = 100, z = 100},
-		scale = 0.01,
+		seed = 137, octaves = 3, persist = 0.7},
-		spread = {x = 100, y = 100, z = 100},
-		seed = 137,
-		octaves = 3,
-		persist = 0.7,
-	},
 	biomes = {"deciduous_forest", "grassytwo", "jumble"},
-	y_min = 1,
+	schematic = dpath .. "bush.mts"})
-	y_max = 31000,
-	schematic = dpath .. "bush.mts",
-	flags = "place_center_x, place_center_z"
-})
 
 -- default acacia bush
 
-minetest.register_decoration({
+register_decoration(1, {
-	deco_type = "schematic",
+	place_on = {"default:dirt_with_dry_grass", "default:dry_dirt_with_dry_grass"},
-	place_on = {
-		"default:dirt_with_dry_grass", "default:dry_dirt_with_dry_grass"},
 	sidelen = 16,
 	noise_params = {
-		offset = -0.004,
+		offset = -0.004, scale = 0.01, spread = {x = 100, y = 100, z = 100},
-		scale = 0.01,
+		seed = 90155, octaves = 3, persist = 0.7},
-		spread = {x = 100, y = 100, z = 100},
-		seed = 90155,
-		octaves = 3,
-		persist = 0.7,
-	},
 	biomes = {"savanna", "mesa"},
-	y_min = 1,
+	schematic = dpath .. "acacia_bush.mts"})
-	y_max = 31000,
-	schematic = dpath .. "acacia_bush.mts",
-	flags = "place_center_x, place_center_z"
-})
 
 -- default pine bush
 
-if minetest.registered_nodes["default:pine_bush"] then
+register_decoration((minetest.registered_nodes["default:pine_bush"] and 1), {
-
+	name = "default:pine_bush",
-	minetest.register_decoration({
+	place_on = {"default:dirt_with_snow"},
-		name = "default:pine_bush",
+	sidelen = 16,
-		deco_type = "schematic",
+	noise_params = {
-		place_on = {"default:dirt_with_snow"},
+		offset = -0.004, scale = 0.01, spread = {x = 100, y = 100, z = 100},
-		sidelen = 16,
+		seed = 137, octaves = 3, persist = 0.7},
-		noise_params = {
+	biomes = {"taiga"},
-			offset = -0.004,
+	y_min = 4, y_max = 120,
-			scale = 0.01,
+	schematic = dpath .. "pine_bush.mts"})
-			spread = {x = 100, y = 100, z = 100},
-			seed = 137,
-			octaves = 3,
-			persist = 0.7,
-		},
-		biomes = {"taiga"},
-		y_max = 31000,
-		y_min = 4,
-		schematic = dpath .. "pine_bush.mts",
-		flags = "place_center_x, place_center_z"
-	})
-end
 
 -- default blueberry bush
 
-if minetest.registered_nodes["default:blueberry_bush_leaves"] then
+register_decoration((minetest.registered_nodes["default:blueberry_bush_leaves"] and 1), {
-
+	name = "default:blueberry_bush",
-	minetest.register_decoration({
+	place_on = {"default:dirt_with_coniferous_litter", "default:dirt_with_snow"},
-		name = "default:blueberry_bush",
+	sidelen = 16,
-		deco_type = "schematic",
+	noise_params = {
-		place_on = {
+		offset = -0.004, scale = 0.01, spread = {x = 100, y = 100, z = 100},
-			"default:dirt_with_coniferous_litter", "default:dirt_with_snow"},
+		seed = 697, octaves = 3, persist = 0.7},
-		sidelen = 16,
+	biomes = {"coniferous_forest", "taiga"},
-		noise_params = {
+	place_offset_y = 1,
-			offset = -0.004,
+	schematic = dpath .. "blueberry_bush.mts"})
-			scale = 0.01,
-			spread = {x = 100, y = 100, z = 100},
-			seed = 697,
-			octaves = 3,
-			persist = 0.7,
-		},
-		biomes = {"coniferous_forest", "taiga"},
-		y_max = 31000,
-		y_min = 1,
-		place_offset_y = 1,
-		schematic = dpath .. "blueberry_bush.mts",
-		flags = "place_center_x, place_center_z"
-	})
-end
 
 -- place waterlily in beach areas
 
-minetest.register_decoration({
+register_decoration(1, {
-	deco_type = "schematic",
 	place_on = {"default:sand"},
 	sidelen = 16,
 	noise_params = {
-		offset = -0.12,
+		offset = -0.12, scale = 0.3, spread = {x = 200, y = 200, z = 200},
-		scale = 0.3,
+		seed = 33, octaves = 3, persist = 0.7},
-		spread = {x = 200, y = 200, z = 200},
+	biomes = {"desert_ocean", "plains_ocean", "sandclay", "mesa_ocean", "grove_ocean",
-		seed = 33,
+			"deciduous_forest_ocean", "swamp_ocean"},
-		octaves = 3,
+	y_min = 0, y_max = 0,
-		persist = 0.7
-	},
-	biomes = {"desert_ocean", "plains_ocean", "sandclay",
-		"mesa_ocean", "grove_ocean", "deciduous_forest_ocean", "swamp_ocean"},
-	y_min = 0,
-	y_max = 0,
 	schematic = ethereal.waterlily,
-	rotation = "random"
+	rotation = "random"})
-})
 
 -- coral reef
 
@@ -346,130 +375,86 @@ if ethereal.reefs == 1 then
 	minetest.override_item("default:coral_orange", {groups = {crumbly = 3}})
 	minetest.override_item("default:coral_brown", {groups = {crumbly = 3}})
 
-	minetest.register_decoration({
+	register_decoration(1, {
-		deco_type = "schematic",
 		place_on = {"default:sand"},
 		noise_params = {
-			offset = -0.15,
+			offset = -0.15, scale = 0.1, spread = {x = 100, y = 100, z = 100},
-			scale = 0.1,
+			seed = 7013, octaves = 3, persist = 1},
-			spread = {x = 100, y = 100, z = 100},
-			seed = 7013,
-			octaves = 3,
-			persist = 1,
-		},
 		biomes = {"desert_ocean", "grove_ocean"},
-		y_min = -8,
+		y_min = -8, y_max = -2,
-		y_max = -2,
 		schematic = path .. "corals.mts",
-		flags = "place_center_x, place_center_z",
+		rotation = "random"})
-		rotation = "random"
-	})
 end
 
 -- tree logs
 
 if ethereal.logs == 1 then
 
-if ethereal.grassy == 1 or ethereal.prairie == 1 then
+	register_decoration(ethereal.prairie, {
-
-	minetest.register_decoration({
 		name = "default:apple_log",
-		deco_type = "schematic",
 		place_on = {"default:dirt_with_grass", "ethereal:prairie_dirt"},
 		place_offset_y = 1,
 		sidelen = 16,
 		fill_ratio = 0.001,
 		biomes = {"deciduous_forest", "jumble", "swamp", "prairie"},
-		y_max = 100,
-		y_min = 1,
 		schematic = dpath .. "apple_log.mts",
 		flags = "place_center_x",
 		rotation = "random",
-		spawn_by = {"default:dirt_with_grass", "ethereal:prairie_dirt"},
+		spawn_by = {"default:dirt_with_grass", "ethereal:prairie_dirt"}, num_spawn_by = 8
-		num_spawn_by = 8
 	})
-end
 
-if ethereal.junglee == 1 then
+	register_decoration(ethereal.junglee, {
-
-	minetest.register_decoration({
 		name = "default:jungle_log",
-		deco_type = "schematic",
 		place_on = {"default:dirt_with_rainforest_litter"},
 		place_offset_y = 1,
 		sidelen = 80,
 		fill_ratio = 0.005,
 		biomes = {"junglee"},
-		y_max = 100,
-		y_min = 1,
 		schematic = dpath .. "jungle_log.mts",
 		flags = "place_center_x",
 		rotation = "random",
-		spawn_by = "default:dirt_with_rainforest_litter",
+		spawn_by = "default:dirt_with_rainforest_litter", num_spawn_by = 8
-		num_spawn_by = 8
 	})
-end
 
-if ethereal.snowy == 1 then
+	register_decoration(ethereal.snowy, {
-
-	minetest.register_decoration({
 		name = "default:pine_log",
-		deco_type = "schematic",
 		place_on = {"default:dirt_with_snow", "default:dirt_with_coniferous_litter"},
 		place_offset_y = 1,
 		sidelen = 80,
 		fill_ratio = 0.0018,
 		biomes = {"taiga", "coniferous_forest"},
-		y_max = 100,
+		y_min = 4, y_max = 100,
-		y_min = 4,
 		schematic = dpath .. "pine_log.mts",
 		flags = "place_center_x",
 		rotation = "random",
 		spawn_by = {"default:dirt_with_snow", "default:dirt_with_coniferous_litter"},
 		num_spawn_by = 8
 	})
-end
 
-if ethereal.savanna == 1 then
+	register_decoration(ethereal.savanna, {
-
-	minetest.register_decoration({
 		name = "default:acacia_log",
 		deco_type = "schematic",
 		place_on = {"default:dry_dirt_with_dry_grass"},
 		place_offset_y = 1,
 		sidelen = 16,
 		noise_params = {
-			offset = 0,
+			offset = 0, scale = 0.001, spread = {x = 250, y = 250, z = 250},
-			scale = 0.001,
+			seed = 2, octaves = 3, persist = 0.66},
-			spread = {x = 250, y = 250, z = 250},
-			seed = 2,
-			octaves = 3,
-			persist = 0.66
-		},
 		biomes = {"savanna"},
-		y_max = 100,
-		y_min = 1,
 		schematic = dpath .. "acacia_log.mts",
 		flags = "place_center_x",
 		rotation = "random",
-		spawn_by = "default:dry_dirt_with_dry_grass",
+		spawn_by = "default:dry_dirt_with_dry_grass", num_spawn_by = 8
-		num_spawn_by = 8
 	})
-end
 
-if ethereal.plains == 1 then
+	register_decoration(ethereal.plains, {
-
-	minetest.register_decoration({
 		name = "ethereal:scorched_log",
-		deco_type = "schematic",
 		place_on = {"ethereal:dry_dirt"},
 		place_offset_y = 1,
 		sidelen = 80,
 		fill_ratio = 0.0018,
 		biomes = {"plains"},
-		y_max = 100,
+		y_min = 4, y_max = 100,
-		y_min = 4,
-
 		schematic = {
 			size = {x = 3, y = 1, z = 1},
 			data = {
@@ -480,24 +465,17 @@ if ethereal.plains == 1 then
 		},
 		flags = "place_center_x",
 		rotation = "random",
-		spawn_by = "ethereal:dry_dirt",
+		spawn_by = "ethereal:dry_dirt", num_spawn_by = 8
-		num_spawn_by = 8
 	})
-end
 
-if ethereal.grove == 1 then
+	register_decoration(ethereal.grove, {
-
-	minetest.register_decoration({
 		name = "ethereal:banana_log",
-		deco_type = "schematic",
 		place_on = {"ethereal:grove_dirt"},
 		place_offset_y = 1,
 		sidelen = 80,
 		fill_ratio = 0.0018,
 		biomes = {"grove"},
-		y_max = 100,
+		y_min = 4, y_max = 100,
-		y_min = 4,
-
 		schematic = {
 			size = {x = 3, y = 1, z = 1},
 			data = {
@@ -508,9 +486,6 @@ if ethereal.grove == 1 then
 		},
 		flags = "place_center_x",
 		rotation = "random",
-		spawn_by = "ethereal:grove_dirt",
+		spawn_by = "ethereal:grove_dirt", num_spawn_by = 8
-		num_spawn_by = 8
 	})
 end
-
-end -- end if ethereal.logs