Mods in den Spieleordner reingeschoben. So richtig tief.

mods/farming/crops/artichoke.lua

@@ -55,6 +55,11 @@ minetest.register_node("farming:artichoke_3", table.copy(def))
 -- stage 4
 
 def.tiles = {"farming_artichoke_4.png"}
+def.drop = {
+	items = {
+		{items = {"farming:artichoke"}, rarity = 1}
+	}
+}
 minetest.register_node("farming:artichoke_4", table.copy(def))
 
 -- stage 5 (final)
@@ -81,4 +86,22 @@ farming.registered_plants["farming:artichoke"] = {
 }
 
 -- mapgen
-farming.register_decoration("artichoke",5)
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {
+		"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:grove_dirt"
+	},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.artichoke,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 123,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 1, y_max = 13,
+	decoration = "farming:artichoke_4",
+	spawn_by = "group:tree", num_spawn_by = 1
+})

mods/farming/crops/asparagus.lua

@@ -59,7 +59,7 @@ minetest.register_node("farming:asparagus_3", table.copy(def))
 def.tiles = {"farming_asparagus_4.png"}
 def.drop = {
 	items = {
-		{items = {"farming:asparagus"}, rarity = 2}
+		{items = {"farming:asparagus"}, rarity = 1}
 	}
 }
 minetest.register_node("farming:asparagus_4", table.copy(def))
@@ -71,8 +71,8 @@ def.groups.growing = nil
 def.selection_box = farming.select_final
 def.drop = {
 	items = {
-		{items = {"farming:asparagus"}, rarity = 1},
-		{items = {"farming:asparagus 2"}, rarity = 2}
+		{items = {"farming:asparagus 2"}, rarity = 1},
+		{items = {"farming:asparagus"}, rarity = 2}
 	}
 }
 minetest.register_node("farming:asparagus_5", table.copy(def))
@@ -88,4 +88,21 @@ farming.registered_plants["farming:asparagus"] = {
 }
 
 -- mapgen
-farming.register_decoration("asparagus",5)
+
+minetest.register_decoration({
+	name = "farming:asparagus_5",
+	deco_type = "simple",
+	place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.asparagus,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 234,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 8, y_max = 32,
+	decoration = "farming:asparagus_4",
+	param2 = 3
+})

mods/farming/crops/barley.lua

@@ -116,10 +116,10 @@ def.groups.growing = nil
 def.selection_box = farming.select_final
 def.drop = {
 	items = {
-		{items = {"farming:barley"}, rarity = 1},
-		{items = {"farming:barley"}, rarity = 3},
-		{items = {"farming:seed_barley"}, rarity = 1},
-		{items = {"farming:seed_barley"}, rarity = 3}
+		{items = {"farming:barley 2"}, rarity = 1},
+		{items = {"farming:barley"}, rarity = 2},
+		{items = {"farming:seed_barley 2"}, rarity = 1},
+		{items = {"farming:seed_barley"}, rarity = 2}
 	}
 }
 minetest.register_node("farming:barley_8", table.copy(def))

mods/farming/crops/beans.lua

@@ -190,8 +190,8 @@ def.drop = {
 	items = {
 		{items = {"farming:beanpole"}, rarity = 1},
 		{items = {"farming:beans 3"}, rarity = 1},
-		{items = {"farming:beans 2"}, rarity = 2},
-		{items = {"farming:beans 2"}, rarity = 3}
+		{items = {"farming:beans"}, rarity = 2},
+		{items = {"farming:beans"}, rarity = 3}
 	}
 }
 minetest.register_node("farming:beanpole_5", table.copy(def))
@@ -234,4 +234,19 @@ minetest.register_node("farming:beanbush", {
 })
 
 -- mapgen
-farming.register_decoration("beans",5,"farming:beanbush")
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.beans,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 345,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 18, y_max = 38,
+	decoration = "farming:beanbush"
+})

mods/farming/crops/beetroot.lua

@@ -64,11 +64,10 @@ def.tiles = {"farming_beetroot_5.png"}
 def.groups.growing = nil
 def.selection_box = farming.select_final
 def.drop = {
-	max_items = 4, items = {
-		{items = {"farming:beetroot"}, rarity = 1},
+	items = {
+		{items = {"farming:beetroot 2"}, rarity = 1},
 		{items = {"farming:beetroot"}, rarity = 2},
-		{items = {"farming:beetroot"}, rarity = 3},
-		{items = {"farming:beetroot"}, rarity = 4}
+		{items = {"farming:beetroot"}, rarity = 3}
 	}
 }
 minetest.register_node("farming:beetroot_5", table.copy(def))
@@ -84,4 +83,25 @@ farming.registered_plants["farming:beetroot"] = {
 }
 
 -- mapgen
-farming.register_decoration("beetroot",5)
+
+local spawn_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}
+
+if farming.eth then
+	spawn_on = {"ethereal:prairie_dirt"}
+end
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = spawn_on,
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.beetroot,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 456,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 1, y_max = 20,
+	decoration = "farming:beetroot_5"
+})

mods/farming/crops/blackberry.lua

@@ -61,9 +61,9 @@ def.groups.growing = nil
 def.selection_box = farming.select_final
 def.drop = {
 	items = {
-		{items = {'farming:blackberry 2'}, rarity = 1},
-		{items = {'farming:blackberry'}, rarity = 2},
-		{items = {'farming:blackberry'}, rarity = 3},
+		{items = {"farming:blackberry 2"}, rarity = 1},
+		{items = {"farming:blackberry"}, rarity = 2},
+		{items = {"farming:blackberry"}, rarity = 3},
 	}
 }
 minetest.register_node("farming:blackberry_4", table.copy(def))
@@ -79,4 +79,21 @@ farming.registered_plants["farming:blackberry"] = {
 }
 
 -- mapgen
-farming.register_decoration("blackberry",4)
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {
+		"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
+	},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.blackberry,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 567,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 3, y_max = 20,
+	decoration = "farming:blackberry_4"
+})

mods/farming/crops/blueberry.lua

@@ -78,4 +78,21 @@ farming.registered_plants["farming:blueberries"] = {
 }
 
 -- mapgen
-farming.register_decoration("blueberry",4)
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {
+		"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
+	},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.blueberry,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 678,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 3, y_max = 15,
+	decoration = "farming:blueberry_4"
+})

mods/farming/crops/cabbage.lua

@@ -68,9 +68,9 @@ def.tiles = {"farming_cabbage_6.png"}
 def.groups.growing = nil
 def.selection_box = farming.select_final
 def.drop = {
-	max_items = 2, items = {
+	items = {
 		{items = {"farming:cabbage 2"}, rarity = 1},
-		{items = {"farming:cabbage 1"}, rarity = 2}
+		{items = {"farming:cabbage"}, rarity = 3}
 	}
 }
 minetest.register_node("farming:cabbage_6", table.copy(def))
@@ -86,4 +86,19 @@ farming.registered_plants["farming:cabbage"] = {
 }
 
 -- mapgen
-farming.register_decoration("cabbage",6)
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.cabbage,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 789,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 2, y_max = 15,
+	decoration = "farming:cabbage_6"
+})

mods/farming/crops/carrot.lua

@@ -77,7 +77,7 @@ def.tiles = {"farming_carrot_7.png"}
 def.drop = {
 	items = {
 		{items = {"farming:carrot"}, rarity = 1},
-		{items = {"farming:carrot 2"}, rarity = 3}
+		{items = {"farming:carrot"}, rarity = 3}
 	}
 }
 minetest.register_node("farming:carrot_7", table.copy(def))
@@ -90,7 +90,8 @@ def.selection_box = farming.select_final
 def.drop = {
 	items = {
 		{items = {"farming:carrot 2"}, rarity = 1},
-		{items = {"farming:carrot 3"}, rarity = 2}
+		{items = {"farming:carrot"}, rarity = 2},
+		{items = {"farming:carrot"}, rarity = 3},
 	}
 }
 minetest.register_node("farming:carrot_8", table.copy(def))
@@ -106,4 +107,21 @@ farming.registered_plants["farming:carrot"] = {
 }
 
 -- mapgen
-farming.register_decoration("carrot",8)
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {
+		"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
+	},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.carrot,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 890,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 1, y_max = 30,
+	decoration = "farming:carrot_7"
+})

mods/farming/crops/chili.lua

@@ -80,8 +80,10 @@ def.groups.growing = nil
 def.selection_box = farming.select_final
 def.drop = {
 	items = {
-		{items = {"farming:chili_pepper 3"}, rarity = 1},
-		{items = {"farming:chili_pepper 2"}, rarity = 2}
+		{items = {"farming:chili_pepper 2"}, rarity = 1},
+		{items = {"farming:chili_pepper"}, rarity = 2},
+		{items = {"farming:chili_pepper"}, rarity = 3},
+		{items = {"farming:chili_pepper"}, rarity = 4}
 	}
 }
 minetest.register_node("farming:chili_8", table.copy(def))
@@ -97,4 +99,23 @@ farming.registered_plants["farming:chili_pepper"] = {
 }
 
 -- mapgen
-farming.register_decoration("chili",8)
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {
+		"default:dirt_with_grass", "default:dirt_with_rainforest_litter",
+		"mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
+	},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.chili,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 901,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 5, y_max = 45,
+	decoration = "farming:chili_8",
+	spawn_by = "group:tree", num_spawn_by = 1
+})

mods/farming/crops/cocoa.lua

@@ -113,7 +113,7 @@ minetest.register_node("farming:cocoa_2", table.copy(def))
 def.tiles = {"farming_cocoa_3.png"}
 def.drop = {
 	items = {
-		{items = {"farming:cocoa_beans_raw 1"}, rarity = 1}
+		{items = {"farming:cocoa_beans_raw"}, rarity = 1}
 	}
 }
 minetest.register_node("farming:cocoa_3", table.copy(def))
@@ -126,8 +126,8 @@ def.growth_check = nil
 def.drop = {
 	items = {
 		{items = {"farming:cocoa_beans_raw 2"}, rarity = 1},
-		{items = {"farming:cocoa_beans_raw 1"}, rarity = 2},
-		{items = {"farming:cocoa_beans_raw 1"}, rarity = 4}
+		{items = {"farming:cocoa_beans_raw"}, rarity = 2},
+		{items = {"farming:cocoa_beans_raw"}, rarity = 3}
 	}
 }
 minetest.register_node("farming:cocoa_4", table.copy(def))

mods/farming/crops/coffee.lua

@@ -62,8 +62,8 @@ def.selection_box = farming.select_final
 def.drop = {
 	items = {
 		{items = {"farming:coffee_beans 2"}, rarity = 1},
-		{items = {"farming:coffee_beans 2"}, rarity = 2},
-		{items = {"farming:coffee_beans 2"}, rarity = 3}
+		{items = {"farming:coffee_beans"}, rarity = 2},
+		{items = {"farming:coffee_beans"}, rarity = 3}
 	}
 }
 minetest.register_node("farming:coffee_5", table.copy(def))

mods/farming/crops/corn.lua

@@ -79,7 +79,6 @@ def.tiles = {"farming_corn_7.png"}
 def.drop = {
 	items = {
 		{items = {"farming:corn"}, rarity = 1},
-		{items = {"farming:corn"}, rarity = 2},
 		{items = {"farming:corn"}, rarity = 3}
 	}
 }
@@ -93,8 +92,8 @@ def.selection_box = farming.select_final
 def.drop = {
 	items = {
 		{items = {"farming:corn 2"}, rarity = 1},
-		{items = {"farming:corn 2"}, rarity = 2},
-		{items = {"farming:corn 2"}, rarity = 2}
+		{items = {"farming:corn"}, rarity = 2},
+		{items = {"farming:corn"}, rarity = 3}
 	}
 }
 minetest.register_node("farming:corn_8", table.copy(def))

mods/farming/crops/cotton.lua

@@ -93,12 +93,6 @@ minetest.register_node("farming:cotton_5", table.copy(def))
 -- stage 6
 
 def.tiles = {"farming_cotton_6.png"}
-def.drop = {
-	items = {
-		{items = {"farming:cotton"}, rarity = 1},
-		{items = {"farming:cotton"}, rarity = 2}
-	}
-}
 minetest.register_node("farming:cotton_6", table.copy(def))
 
 -- stage 7
@@ -106,10 +100,8 @@ minetest.register_node("farming:cotton_6", table.copy(def))
 def.tiles = {"farming_cotton_7.png"}
 def.drop = {
 	items = {
-		{items = {"farming:cotton"}, rarity = 1},
 		{items = {"farming:cotton"}, rarity = 2},
-		{items = {"farming:seed_cotton"}, rarity = 1},
-		{items = {"farming:seed_cotton"}, rarity = 2}
+		{items = {"farming:seed_cotton"}, rarity = 1}
 	}
 }
 minetest.register_node("farming:cotton_7", table.copy(def))
@@ -171,4 +163,37 @@ minetest.register_node("farming:cotton_wild", {
 })
 
 -- mapgen
-farming.register_decoration("cotton",8)
+
+local spawn_on = {
+	"default:dry_dirt_with_dry_grass", "default:dirt_with_dry_grass",
+	"mcl_core:dirt_with_grass"
+}
+
+if farming.mapgen == "v6" then
+	spawn_on = {"default:dirt_with_grass"}
+end
+
+minetest.register_decoration({
+	name = "farming:cotton_wild",
+	deco_type = "simple",
+	place_on = spawn_on,
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.cotton,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 4242,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 1, y_max = 120,
+	decoration = "farming:cotton_wild"
+})
+
+--[[ Cotton using api
+farming.register_plant("farming:cotton", {
+	description = "Cotton seed",
+	inventory_image = "farming_cotton_seed.png",
+	groups = {flammable = 2},
+	steps = 8,
+})]]

mods/farming/crops/cucumber.lua

@@ -63,7 +63,7 @@ def.selection_box = farming.select_final
 def.drop = {
 	items = {
 		{items = {"farming:cucumber 2"}, rarity = 1},
-		{items = {"farming:cucumber 2"}, rarity = 2}
+		{items = {"farming:cucumber"}, rarity = 2}
 	}
 }
 minetest.register_node("farming:cucumber_4", table.copy(def))
@@ -79,4 +79,22 @@ farming.registered_plants["farming:cucumber"] = {
 }
 
 -- mapgen
-farming.register_decoration("cucumber",4)
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {
+		"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
+	},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.cucumber,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 245,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 1, y_max = 20,
+	decoration = "farming:cucumber_4",
+	spawn_by = {"group:water", "group:sand"}, num_spawn_by = 1
+})

mods/farming/crops/eggplant.lua

@@ -67,7 +67,7 @@ def.selection_box = farming.select_final
 def.drop = {
 	items = {
 		{items = {"farming:eggplant 2"}, rarity = 1},
-		{items = {"farming:eggplant 2"}, rarity = 2}
+		{items = {"farming:eggplant"}, rarity = 2}
 	}
 }
 minetest.register_node("farming:eggplant_4", table.copy(def))
@@ -83,4 +83,20 @@ farming.registered_plants["farming:eggplant"] = {
 }
 
 -- mapgen
-farming.register_decoration("eggplant",4)
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.eggplant,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 356,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 1, y_max = 40,
+	decoration = "farming:eggplant_3",
+	param2 = 3
+})

mods/farming/crops/garlic.lua

@@ -63,9 +63,9 @@ def.groups.growing = nil
 def.selection_box = farming.select_final
 def.drop = {
 	items = {
-		{items = {"farming:garlic 3"}, rarity = 1},
+		{items = {"farming:garlic 2"}, rarity = 1},
 		{items = {"farming:garlic"}, rarity = 2},
-		{items = {"farming:garlic"}, rarity = 5}
+		{items = {"farming:garlic"}, rarity = 3}
 	}
 }
 minetest.register_node("farming:garlic_5", table.copy(def))
@@ -81,4 +81,23 @@ farming.registered_plants["farming:garlic"] = {
 }
 
 -- mapgen
-farming.register_decoration("garlic",5)
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {
+		"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt",
+		"default:dirt_with_rainforest_litter"
+	},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.garlic,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 467,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 3, y_max = 45,
+	decoration = "farming:garlic_5",
+	spawn_by = "group:tree", num_spawn_by = 1
+})

mods/farming/crops/ginger.lua

@@ -66,7 +66,8 @@ def.selection_box = farming.select_final
 def.drop = {
 	items = {
 		{items = {"farming:ginger 2"}, rarity = 1},
-		{items = {"farming:ginger 2"}, rarity = 2}
+		{items = {"farming:ginger"}, rarity = 2},
+		{items = {"farming:ginger"}, rarity = 3}
 	}
 }
 minetest.register_node("farming:ginger_4", table.copy(def))
@@ -82,4 +83,24 @@ farming.registered_plants["farming:ginger"] = {
 }
 
 -- mapgen
-farming.register_decoration("ginger",5)
+
+minetest.register_decoration({
+	name = "farming:ginger_4",
+	deco_type = "simple",
+	place_on = {
+		"default:dirt_with_rainforest_litter", "mcl_core:dirt_with_grass",
+		"ethereal:prairie_dirt"
+	},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.ginger,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 999,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 1, y_max = 80,
+	decoration = "farming:ginger_3",
+	param2 = 3
+})

mods/farming/crops/grapes.lua

@@ -202,9 +202,10 @@ def.selection_box = farming.select_final
 def.drop = {
 	items = {
 		{items = {"farming:trellis"}, rarity = 1},
-		{items = {"farming:grapes 3"}, rarity = 1},
-		{items = {"farming:grapes 1"}, rarity = 2},
-		{items = {"farming:grapes 1"}, rarity = 3}
+		{items = {"farming:grapes 2"}, rarity = 1},
+		{items = {"farming:grapes"}, rarity = 2},
+		{items = {"farming:grapes"}, rarity = 3},
+		{items = {"farming:grapes"}, rarity = 4}
 	}
 }
 minetest.register_node("farming:grapes_8", table.copy(def))
@@ -232,9 +233,9 @@ minetest.register_node("farming:grapebush", {
 	sunlight_propagates = true,
 	drop = {
 		items = {
-			{items = {"farming:grapes 1"}, rarity = 1},
-			{items = {"farming:grapes 1"}, rarity = 2},
-			{items = {"farming:grapes 1"}, rarity = 3}
+			{items = {"farming:grapes"}, rarity = 1},
+			{items = {"farming:grapes"}, rarity = 2},
+			{items = {"farming:grapes"}, rarity = 3}
 		}
 	},
 	selection_box = farming.select,
@@ -247,4 +248,21 @@ minetest.register_node("farming:grapebush", {
 })
 
 -- mapgen
-farming.register_decoration("grapes",8,"farming:grapebush")
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {
+		"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
+	},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.grapes,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 578,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 25, y_max = 50,
+	decoration = "farming:grapebush"
+})

mods/farming/crops/hemp.lua

@@ -118,7 +118,7 @@ def.drop = {
 	items = {
 		{items = {"farming:hemp_leaf 2"}, rarity = 1},
 		{items = {"farming:hemp_leaf"}, rarity = 2},
-		{items = {"farming:seed_hemp"}, rarity = 1},
+		{items = {"farming:seed_hemp 2"}, rarity = 1},
 		{items = {"farming:seed_hemp"}, rarity = 2}
 	}
 }
@@ -135,4 +135,23 @@ farming.registered_plants["farming:hemp"] = {
 }
 
 -- mapgen
-farming.register_decoration("hemp",7)
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {
+		"default:dirt_with_grass", "default:dirt_with_rainforest_litter",
+		"mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
+	},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.hemp,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 420,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 3, y_max = 45,
+	decoration = "farming:hemp_7",
+	spawn_by = "group:tree", num_spawn_by = 1
+})

mods/farming/crops/lettuce.lua

@@ -64,7 +64,7 @@ def.selection_box = farming.select_final
 def.drop = {
 	items = {
 		{items = {"farming:lettuce 2"}, rarity = 1},
-		{items = {"farming:lettuce 1"}, rarity = 2}
+		{items = {"farming:lettuce"}, rarity = 3}
 	}
 }
 minetest.register_node("farming:lettuce_5", table.copy(def))
@@ -80,4 +80,21 @@ farming.registered_plants["farming:lettuce"] = {
 }
 
 -- mapgen
-farming.register_decoration("lettuce",5)
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {
+		"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
+	},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.lettuce,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 689,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 5, y_max = 35,
+	decoration = "farming:lettuce_5"
+})

mods/farming/crops/melon.lua

@@ -105,4 +105,22 @@ farming.registered_plants["farming:melon"] = {
 
 -- mapgen
 
-farming.register_decoration("melon",8)
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {
+		"default:dirt_with_grass", "default:dirt_with_dry_grass",
+		"default:dirt_with_rainforest_litter", "mcl_core:dirt_with_grass"
+	},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.melon,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 790,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 1, y_max = 3,
+	decoration = "farming:melon_8",
+	spawn_by = {"group:water", "group:sand"}, num_spawn_by = 1
+})

mods/farming/crops/mint.lua

@@ -82,9 +82,9 @@ def.selection_box = farming.select_final
 def.drop = {
 	items = {
 		{items = {"farming:mint_leaf 2"}, rarity = 1},
-		{items = {"farming:mint_leaf 2"}, rarity = 2},
-		{items = {"farming:seed_mint 1"}, rarity = 1},
-		{items = {"farming:seed_mint 2"}, rarity = 2}
+		{items = {"farming:mint_leaf"}, rarity = 2},
+		{items = {"farming:seed_mint 2"}, rarity = 1},
+		{items = {"farming:seed_mint"}, rarity = 2}
 	}
 }
 minetest.register_node("farming:mint_4", table.copy(def))
@@ -100,4 +100,23 @@ farming.registered_plants["farming:mint"] = {
 }
 
 -- mapgen
-farming.register_decoration("mint",4)
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {
+		"default:dirt_with_grass", "default:dirt_with_coniferous_litter",
+		"mcl_core:dirt_with_grass", "ethereal:bamboo_dirt"
+	},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.mint,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 801,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 1, y_max = 75,
+	decoration = "farming:mint_4",
+	spawn_by = {"group:water", "group:sand"}, num_spawn_by = 1
+})

mods/farming/crops/onion.lua

@@ -72,12 +72,10 @@ def.tiles = {"crops_onion_plant_5.png"}
 def.groups.growing = nil
 def.selection_box = farming.select_final
 def.drop = {
-	max_items = 5, items = {
-		{items = {"farming:onion"}, rarity = 1},
-		{items = {"farming:onion"}, rarity = 1},
+	items = {
+		{items = {"farming:onion 2"}, rarity = 1},
 		{items = {"farming:onion"}, rarity = 2},
-		{items = {"farming:onion"}, rarity = 2},
-		{items = {"farming:onion"}, rarity = 5}
+		{items = {"farming:onion"}, rarity = 4}
 	}
 }
 minetest.register_node("farming:onion_5", table.copy(def))
@@ -93,4 +91,21 @@ farming.registered_plants["farming:onion"] = {
 }
 
 -- mapgen
-farming.register_decoration("onion",5)
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {
+		"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
+	},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.onion,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 912,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 5, y_max = 28,
+	decoration = "farming:onion_5"
+})

mods/farming/crops/parsley.lua

@@ -72,4 +72,22 @@ farming.registered_plants["farming:parsley"] = {
 }
 
 -- mapgen
-farming.register_decoration("parsley",5)
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {
+		"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt",
+		"ethereal:grove_dirt"
+	},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.parsley,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 23,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 10, y_max = 40,
+	decoration = "farming:parsley_3"
+})

mods/farming/crops/peas.lua

@@ -71,11 +71,10 @@ def.tiles = {"farming_pea_5.png"}
 def.groups.growing = nil
 def.selection_box = farming.select_final
 def.drop = {
-	max_items = 5, items = {
-		{items = {"farming:pea_pod"}, rarity = 1},
+	items = {
+		{items = {"farming:pea_pod 2"}, rarity = 1},
 		{items = {"farming:pea_pod"}, rarity = 2},
-		{items = {"farming:pea_pod"}, rarity = 3},
-		{items = {"farming:pea_pod"}, rarity = 5}
+		{items = {"farming:pea_pod"}, rarity = 3}
 	}
 }
 minetest.register_node("farming:pea_5", table.copy(def))
@@ -91,4 +90,21 @@ farming.registered_plants["farming:pea_pod"] = {
 }
 
 -- mapgen
-farming.register_decoration("pea",5)
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {
+		"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
+	},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.peas,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 132,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 25, y_max = 55,
+	decoration = "farming:pea_5"
+})

mods/farming/crops/pepper.lua

@@ -107,7 +107,7 @@ minetest.register_node("farming:pepper_4", table.copy(def))
 def.tiles = {"crops_pepper_plant_5.png"}
 def.selection_box = farming.select_final
 def.drop = {
-	max_items = 2, items = {
+	items = {
 		{items = {"farming:pepper 2"}, rarity = 1},
 		{items = {"farming:pepper"}, rarity = 2},
 		{items = {"farming:pepper"}, rarity = 3}
@@ -119,7 +119,7 @@ minetest.register_node("farming:pepper_5", table.copy(def))
 
 def.tiles = {"crops_pepper_plant_6.png"}
 def.drop = {
-	max_items = 2, items = {
+	items = {
 		{items = {"farming:pepper_yellow 2"}, rarity = 1},
 		{items = {"farming:pepper_yellow"}, rarity = 2},
 		{items = {"farming:pepper_yellow"}, rarity = 3}
@@ -132,7 +132,7 @@ minetest.register_node("farming:pepper_6", table.copy(def))
 def.tiles = {"crops_pepper_plant_7.png"}
 def.groups.growing = nil
 def.drop = {
-	max_items = 2, items = {
+	items = {
 		{items = {"farming:pepper_red 2"}, rarity = 1},
 		{items = {"farming:pepper_red"}, rarity = 2},
 		{items = {"farming:pepper_red"}, rarity = 3}
@@ -147,8 +147,27 @@ farming.registered_plants["farming:pepper"] = {
 	seed = "farming:peppercorn",
 	minlight = farming.min_light,
 	maxlight = farming.max_light,
-	steps = 7
+	steps = 5
 }
 
 -- mapgen
-farming.register_decoration("pepper",7)
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {
+		"default:dirt_with_grass", "default:dirt_with_rainforest_litter",
+		"mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
+	},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.pepper,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 243,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 5, y_max = 35,
+	decoration = {"farming:pepper_5", "farming:pepper_6", "farming:pepper_7"},
+	spawn_by = "group:tree", num_spawn_by = 1
+})

mods/farming/crops/pineapple.lua

@@ -100,7 +100,7 @@ def.selection_box = farming.select_final
 def.drop = {
 	items = {
 		{items = {"farming:pineapple"}, rarity = 1},
-		{items = {"farming:pineapple"}, rarity = 2}
+		{items = {"farming:pineapple"}, rarity = 3}
 	}
 }
 minetest.register_node("farming:pineapple_8", table.copy(def))
@@ -116,4 +116,28 @@ farming.registered_plants["farming:pineapple"] = {
 }
 
 -- mapgen
-farming.register_decoration("pineapple",8)
+
+local spawn_on = {
+	"default:dirt_with_dry_grass", "default:dry_dirt_with_dry_grass",
+	"mcl_core:dirt_with_grass"
+}
+
+if farming.mapgen == "v6" then
+	spawn_on = {"default:dirt_with_grass"}
+end
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = spawn_on,
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.pineapple,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 354,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 11, y_max = 30,
+	decoration = "farming:pineapple_8"
+})

mods/farming/crops/potato.lua

@@ -83,7 +83,8 @@ def.selection_box = farming.select_final
 def.drop = {
 	items = {
 		{items = {"farming:potato 2"}, rarity = 1},
-		{items = {"farming:potato 3"}, rarity = 2}
+		{items = {"farming:potato"}, rarity = 2},
+		{items = {"farming:potato"}, rarity = 3}
 	}
 }
 minetest.register_node("farming:potato_4", table.copy(def))
@@ -99,4 +100,22 @@ farming.registered_plants["farming:potato"] = {
 }
 
 -- mapgen
-farming.register_decoration("potato",3)
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {
+		"default:dirt_with_grass", "default:dirt_with_rainforest_litter",
+		"mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
+	},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.potato,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 465,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 5, y_max = 40,
+	decoration = "farming:potato_3"
+})

mods/farming/crops/pumpkin.lua

@@ -107,4 +107,23 @@ farming.registered_plants["farming:pumpkin"] = {
 }
 
 -- mapgen
-farming.register_decoration("pumpkin",8)
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {
+		"default:dirt_with_grass", "default:dirt_with_rainforest_litter",
+		"mcl_core:dirt_with_grass"
+	},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.pumpkin,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 576,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 1, y_max = 3,
+	decoration = "farming:pumpkin_8",
+	spawn_by = {"group:water", "group:sand"}, num_spawn_by = 1
+})

mods/farming/crops/raspberry.lua

@@ -79,4 +79,21 @@ farming.registered_plants["farming:raspberries"] = {
 }
 
 -- mapgen
-farming.register_decoration("raspberry",4)
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {
+		"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
+	},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.raspberry,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 687,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 3, y_max = 15,
+	decoration = "farming:raspberry_4"
+})

mods/farming/crops/rhubarb.lua

@@ -55,6 +55,7 @@ def.tiles = {"farming_rhubarb_3.png"}
 def.drop = {
 	items = {
 		{items = {"farming:rhubarb"}, rarity = 1},
+		{items = {"farming:rhubarb"}, rarity = 3}
 	}
 }
 minetest.register_node("farming:rhubarb_3", table.copy(def))
@@ -84,4 +85,21 @@ farming.registered_plants["farming:rhubarb"] = {
 }
 
 -- mapgen
-farming.register_decoration("rhubarb",3)
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {
+		"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
+	},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.rhubarb,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 798,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 3, y_max = 20,
+	decoration = "farming:rhubarb_3"
+})

mods/farming/crops/rice.lua

@@ -94,11 +94,6 @@ minetest.register_node("farming:rice_4", table.copy(def))
 -- stage 5
 
 def.tiles = {"farming_rice_5.png"}
-def.drop = {
-	items = {
-		{items = {"farming:rice"}, rarity = 2}
-	}
-}
 minetest.register_node("farming:rice_5", table.copy(def))
 
 -- stage 6
@@ -106,7 +101,7 @@ minetest.register_node("farming:rice_5", table.copy(def))
 def.tiles = {"farming_rice_6.png"}
 def.drop = {
 	items = {
-		{items = {"farming:rice"}, rarity = 2}
+		{items = {"farming:seed_rice"}, rarity = 2}
 	}
 }
 minetest.register_node("farming:rice_6", table.copy(def))
@@ -117,7 +112,6 @@ def.tiles = {"farming_rice_7.png"}
 def.drop = {
 	items = {
 		{items = {"farming:seed_rice"}, rarity = 1},
-		{items = {"farming:seed_rice"}, rarity = 2},
 		{items = {"farming:seed_rice"}, rarity = 3}
 	}
 }
@@ -131,8 +125,9 @@ def.selection_box = farming.select_final
 def.drop = {
 	items = {
 		{items = {"farming:seed_rice 2"}, rarity = 1},
-		{items = {"farming:seed_rice 2"}, rarity = 2},
-		{items = {"farming:seed_rice"}, rarity = 3}
+		{items = {"farming:seed_rice"}, rarity = 2},
+		{items = {"farming:seed_rice"}, rarity = 3},
+		{items = {"farming:seed_rice"}, rarity = 4}
 	}
 }
 minetest.register_node("farming:rice_8", table.copy(def))
@@ -146,6 +141,3 @@ farming.registered_plants["farming:rice"] = {
 	maxlight = farming.max_light,
 	steps = 8
 }
-
--- mapgen
-farming.register_decoration("rice",8)

mods/farming/crops/rye_oat.lua

@@ -25,6 +25,8 @@ minetest.override_item("farming:rye", {
 minetest.override_item("farming:rye_1", {drop = {}})
 minetest.override_item("farming:rye_2", {drop = {}})
 minetest.override_item("farming:rye_3", {drop = {}})
+minetest.override_item("farming:rye_4", {drop = {}})
+minetest.override_item("farming:rye_5", {drop = {}})
 
 -- Oats
 
@@ -48,3 +50,5 @@ minetest.override_item("farming:oat", {
 minetest.override_item("farming:oat_1", {drop = {}})
 minetest.override_item("farming:oat_2", {drop = {}})
 minetest.override_item("farming:oat_3", {drop = {}})
+minetest.override_item("farming:oat_4", {drop = {}})
+minetest.override_item("farming:oat_5", {drop = {}})

mods/farming/crops/soy.lua

@@ -64,8 +64,8 @@ minetest.register_node("farming:soy_4", table.copy(def))
 
 def.tiles = {"farming_soy_5.png"}
 def.drop = {
-	max_items = 1, items = {
-		{items = {"farming:soy_pod"}, rarity = 1},
+	items = {
+		{items = {"farming:soy_pod"}, rarity = 2}
 	}
 }
 minetest.register_node("farming:soy_5", table.copy(def))
@@ -74,9 +74,8 @@ minetest.register_node("farming:soy_5", table.copy(def))
 
 def.tiles = {"farming_soy_6.png"}
 def.drop = {
-	max_items = 3, items = {
+	items = {
 		{items = {"farming:soy_pod"}, rarity = 1},
-		{items = {"farming:soy_pod"}, rarity = 2},
 		{items = {"farming:soy_pod"}, rarity = 3}
 	}
 }
@@ -88,12 +87,11 @@ def.tiles = {"farming_soy_7.png"}
 def.groups.growing = nil
 def.selection_box = farming.select_final
 def.drop = {
-	max_items = 5, items = {
-		{items = {"farming:soy_pod"}, rarity = 1},
+	items = {
+		{items = {"farming:soy_pod 2"}, rarity = 1},
 		{items = {"farming:soy_pod"}, rarity = 2},
 		{items = {"farming:soy_pod"}, rarity = 3},
-		{items = {"farming:soy_pod"}, rarity = 4},
-		{items = {"farming:soy_pod"}, rarity = 5}
+		{items = {"farming:soy_pod"}, rarity = 4}
 	}
 }
 minetest.register_node("farming:soy_7", table.copy(def))
@@ -109,4 +107,23 @@ farming.registered_plants["farming:soy_pod"] = {
 }
 
 -- mapgen
-farming.register_decoration("soy",7)
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {
+		"default:dirt_with_grass", "default:dirt_with_dry_grass",
+		"default:dirt_with_rainforest_litter", "default:dry_dirt_with_dry_grass",
+		"mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
+	},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.soy,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 809,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 20, y_max = 50,
+	decoration = "farming:soy_6"
+})

mods/farming/crops/spinach.lua

@@ -66,8 +66,9 @@ def.selection_box = farming.select_final
 def.drop = {
 	items = {
 		{items = {"farming:spinach 2"}, rarity = 1},
-		{items = {"farming:spinach 2"}, rarity = 2},
-		{items = {"farming:spinach 2"}, rarity = 3}
+		{items = {"farming:spinach"}, rarity = 2},
+		{items = {"farming:spinach"}, rarity = 3},
+		{items = {"farming:spinach"}, rarity = 4}
 	}
 }
 minetest.register_node("farming:spinach_4", table.copy(def))
@@ -83,4 +84,20 @@ farming.registered_plants["farming:spinach"] = {
 }
 
 -- mapgen
-farming.register_decoration("spinach",4)
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.spinach,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 910,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 1, y_max = 100,
+	decoration = "farming:spinach_3",
+	param2 = 3
+})

mods/farming/crops/strawberry.lua

@@ -68,12 +68,6 @@ minetest.register_node(":ethereal:strawberry_5", table.copy(def))
 -- stage 6
 
 def.tiles = {"ethereal_strawberry_6.png"}
-def.drop = {
-	items = {
-		{items = {"ethereal:strawberry 1"}, rarity = 2},
-		{items = {"ethereal:strawberry 2"}, rarity = 3}
-	}
-}
 minetest.register_node(":ethereal:strawberry_6", table.copy(def))
 
 -- stage 7
@@ -81,8 +75,8 @@ minetest.register_node(":ethereal:strawberry_6", table.copy(def))
 def.tiles = {"ethereal_strawberry_7.png"}
 def.drop = {
 	items = {
-		{items = {"ethereal:strawberry 1"}, rarity = 1},
-		{items = {"ethereal:strawberry 2"}, rarity = 3}
+		{items = {"ethereal:strawberry"}, rarity = 1},
+		{items = {"ethereal:strawberry"}, rarity = 3}
 	}
 }
 minetest.register_node(":ethereal:strawberry_7", table.copy(def))
@@ -95,7 +89,9 @@ def.selection_box = farming.select_final
 def.drop = {
 	items = {
 		{items = {"ethereal:strawberry 2"}, rarity = 1},
-		{items = {"ethereal:strawberry 3"}, rarity = 3}
+		{items = {"ethereal:strawberry"}, rarity = 2},
+		{items = {"ethereal:strawberry"}, rarity = 3},
+		{items = {"ethereal:strawberry"}, rarity = 4},
 	}
 }
 minetest.register_node(":ethereal:strawberry_8", table.copy(def))
@@ -111,4 +107,21 @@ farming.registered_plants["ethereal:strawberry"] = {
 }
 
 -- mapgen
-farming.register_decoration("strawberry",7)
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {
+		"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
+	},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.strawberry,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 143,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 15, y_max = 55,
+	decoration = "ethereal:strawberry_7"
+})

mods/farming/crops/sunflower.lua

@@ -129,4 +129,21 @@ farming.registered_plants["farming:sunflower"] = {
 }
 
 -- mapgen
-farming.register_decoration("sunflower",8)
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {
+		"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
+	},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.sunflower,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 254,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 10, y_max = 40,
+	decoration = "farming:sunflower_8"
+})

mods/farming/crops/tomato.lua

@@ -90,9 +90,10 @@ def.groups.growing = nil
 def.selection_box = farming.select_final
 def.drop = {
 	items = {
-		{items = {"farming:tomato 3"}, rarity = 1},
-		{items = {"farming:tomato 2"}, rarity = 2},
-		{items = {"farming:tomato 1"}, rarity = 3}
+		{items = {"farming:tomato 2"}, rarity = 1},
+		{items = {"farming:tomato"}, rarity = 2},
+		{items = {"farming:tomato"}, rarity = 3},
+		{items = {"farming:tomato"}, rarity = 4}
 	}
 }
 minetest.register_node("farming:tomato_8", table.copy(def))
@@ -108,4 +109,21 @@ farming.registered_plants["farming:tomato"] = {
 }
 
 -- mapgen
-farming.register_decoration("tomato",8)
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {
+		"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
+	},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.tomato,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 365,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 5, y_max = 25,
+	decoration = "farming:tomato_7"
+})

mods/farming/crops/vanilla.lua

@@ -74,7 +74,6 @@ def.tiles = {"farming_vanilla_7.png"}
 def.drop = {
 	items = {
 		{items = {"farming:vanilla"}, rarity = 1},
-		{items = {"farming:vanilla"}, rarity = 2},
 		{items = {"farming:vanilla"}, rarity = 3}
 	}
 }
@@ -88,9 +87,9 @@ def.selection_box = farming.select_final
 def.drop = {
 	items = {
 		{items = {"farming:vanilla 2"}, rarity = 1},
-		{items = {"farming:vanilla 2"}, rarity = 2},
-		{items = {"farming:vanilla 2"}, rarity = 2},
-		{items = {"farming:vanilla 2"}, rarity = 3}
+		{items = {"farming:vanilla"}, rarity = 2},
+		{items = {"farming:vanilla"}, rarity = 3},
+		{items = {"farming:vanilla"}, rarity = 4}
 	}
 }
 minetest.register_node("farming:vanilla_8", table.copy(def))
@@ -106,4 +105,21 @@ farming.registered_plants["farming:vanilla"] = {
 }
 
 -- mapgen
-farming.register_decoration("vanilla",8)
+
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {
+		"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:grove_dirt"
+	},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = farming.vanilla,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 476,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 5, y_max = 35,
+	decoration = "farming:vanilla_7"
+})

mods/farming/crops/wheat.lua

@@ -84,12 +84,6 @@ minetest.register_node("farming:wheat_4", table.copy(def))
 -- stage 5
 
 def.tiles = {"farming_wheat_5.png"}
-def.drop = {
-	items = {
-		{items = {"farming:wheat"}, rarity = 2},
-		{items = {"farming:seed_wheat"}, rarity = 2}
-	}
-}
 minetest.register_node("farming:wheat_5", table.copy(def))
 
 -- stage 6
@@ -98,7 +92,7 @@ def.tiles = {"farming_wheat_6.png"}
 def.drop = {
 	items = {
 		{items = {"farming:wheat"}, rarity = 2},
-		{items = {"farming:seed_wheat"}, rarity = 1}
+		{items = {"farming:seed_wheat"}, rarity = 2}
 	}
 }
 minetest.register_node("farming:wheat_6", table.copy(def))
@@ -108,10 +102,8 @@ minetest.register_node("farming:wheat_6", table.copy(def))
 def.tiles = {"farming_wheat_7.png"}
 def.drop = {
 	items = {
-		{items = {"farming:wheat"}, rarity = 1},
-		{items = {"farming:wheat"}, rarity = 3},
-		{items = {"farming:seed_wheat"}, rarity = 1},
-		{items = {"farming:seed_wheat"}, rarity = 3}
+		{items = {"farming:wheat"}, rarity = 2},
+		{items = {"farming:seed_wheat"}, rarity = 1}
 	}
 }
 minetest.register_node("farming:wheat_7", table.copy(def))
@@ -123,10 +115,10 @@ def.groups.growing = nil
 def.selection_box = farming.select_final
 def.drop = {
 	items = {
-		{items = {"farming:wheat"}, rarity = 1},
-		{items = {"farming:wheat"}, rarity = 3},
-		{items = {"farming:seed_wheat"}, rarity = 1},
-		{items = {"farming:seed_wheat"}, rarity = 3}
+		{items = {"farming:wheat 2"}, rarity = 1},
+		{items = {"farming:wheat"}, rarity = 2},
+		{items = {"farming:seed_wheat 2"}, rarity = 1},
+		{items = {"farming:seed_wheat"}, rarity = 2}
 	}
 }
 minetest.register_node("farming:wheat_8", table.copy(def))
@@ -140,5 +132,3 @@ farming.registered_plants["farming:wheat"] = {
 	maxlight = farming.max_light,
 	steps = 8
 }
--- mapgen
-farming.register_decoration("wheat",8)