Mods in den Spieleordner reingeschoben. So richtig tief.

mods/farming/.gitignore

@@ -0,0 +1 @@
+farming.conf

mods/farming/README.md

@@ -217,7 +217,7 @@ on an older map are enabled and growing properly.
 
 ### Changelog:
 
-- 1.49 - Added {eatable=1} groups to food items with the value giving HP when eaten, improved mineclone support, separated foods from crop files., hoes can deal damage.
+- 1.49 - Added {eatable=1} groups to food items with the value giving HP when eaten, improved mineclone support, separated foods from crop files, hoes can deal damage. Add weed and weed bale (with setting to disable weed growth).
 - 1.48 - added 'farming_use_utensils' setting to enable/disable utensils in recipes, added mayonnaise (thx felfa), added gingerbread man, Added MineClone2 compatibility
 - 1.47 - Now blueberries can make blue dye, tweak soil types to work better with older 0.4.x clients and add spanish translation (thx mckaygerhard), add trellis setting to registered_crops and fix pea and soy crop names (thx nixnoxus), add strawberries if ethereal mod not active, added asparagus; spinach; eggplant (thx Atlante for new textures), Sugar Cube
 - 1.46 - Added min/max default light settings, added lettuce and blackberries with food items (thanks OgelGames), added soya, vanilla and sunflowers (thanks Felfa), added tofu, added salt crystals (thanks gorlock)

mods/farming/compatibility.lua

@@ -34,12 +34,9 @@ else
 		sunlight_propagates = true,
 		walkable = false,
 		selection_box = {
-			type = "fixed",
-			fixed = {-0.2, -0.5, -0.2, 0.2, 0.2, 0.2}
-		},
-		groups = {
-			food_banana = 1, fleshy = 3, dig_immediate = 3
+			type = "fixed", fixed = {-0.2, -0.5, -0.2, 0.2, 0.2, 0.2}
 		},
+		groups = {food_banana = 1, fleshy = 3, dig_immediate = 3},
 		is_ground_content = false,
 		on_use = minetest.item_eat(2),
 		sounds = farming.node_sound_leaves_defaults()
@@ -101,12 +98,9 @@ else
 		sunlight_propagates = true,
 		walkable = false,
 		selection_box = {
-			type = "fixed",
-			fixed = {-0.2, -0.3, -0.2, 0.2, 0.2, 0.2}
-		},
-		groups = {
-			food_orange = 1, fleshy = 3, dig_immediate = 3, flammable = 2
+			type = "fixed", fixed = {-0.2, -0.3, -0.2, 0.2, 0.2, 0.2}
 		},
+		groups = {food_orange = 1, fleshy = 3, dig_immediate = 3, flammable = 2},
 		is_ground_content = false,
 		on_use = minetest.item_eat(4),
 		sounds = farming.node_sound_leaves_defaults()
@@ -165,7 +159,3 @@ alias("farming_plus:tomato_1", "farming:tomato_2")
 alias("farming_plus:tomato_2", "farming:tomato_4")
 alias("farming_plus:tomato_3", "farming:tomato_6")
 alias("farming_plus:tomato", "farming:tomato_8")
-
--- Weeds
-
-alias("farming:weed", "default:grass_2")

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)

mods/farming/farming.conf

@@ -1,51 +0,0 @@
-
---[[
-	Farming settings can be changed here and kept inside mod folder
-	even after the mod has been updated, or you can place inside
-	world folder for map specific settings.
---]]
-
--- true to enable crop/food in-game and on mapgen set spawn rarety
-farming.asparagus = 0.002
-farming.eggplant = 0.002
-farming.spinach = 0.002
-farming.carrot = false
-farming.potato = false
-farming.tomato = 0.001
-farming.cucumber = 0.001
-farming.corn = false
-farming.coffee = false
-farming.melon = false
-farming.pumpkin = pumpkin
-farming.cocoa = false -- true or false only
-farming.raspberry = 0.001
-farming.blueberry = false
-farming.rhubarb = 0.001
-farming.beans = 0.001
-farming.grapes = 0.001
-farming.barley = false -- true or false only
-farming.chili = 0.003
-farming.hemp = 0.003
-farming.garlic = 0.001
-farming.onion = 0.001
-farming.pepper = 0.002
-farming.pineapple = 0.001
-farming.peas = 0.001
-farming.beetroot = false
-farming.mint = 0.005
-farming.cabbage = 0.001
-farming.blackberry = false
-farming.lettuce = 0.001
-farming.soy = false
-farming.vanilla = 0.001
-farming.artichoke = 0.001
-farming.parsley = 0.002
-farming.sunflower = 0.001
-farming.ginger = 0.002
-farming.strawberry = false
-farming.grains = true -- true or false only
-farming.rice = true
-
--- default minimum and maximum light levels crops need to grow
-farming.min_light = 12
-farming.max_light = 15

mods/farming/hoes.lua

@@ -244,7 +244,8 @@ local function hoe_area(pos, player)
 	-- remove flora (grass, flowers etc.)
 	local res = minetest.find_nodes_in_area(
 			{x = pos.x - r, y = pos.y - 1, z = pos.z - r},
-			{x = pos.x + r, y = pos.y + 2, z = pos.z + r}, {"group:flora"})
+			{x = pos.x + r, y = pos.y + 2, z = pos.z + r},
+			{"group:flora", "default:dry_shrub"})
 
 	for n = 1, #res do
 		minetest.swap_node(res[n], {name = "air"})
@@ -252,9 +253,9 @@ local function hoe_area(pos, player)
 
 	-- replace dirt with tilled soil
 	res = minetest.find_nodes_in_area_under_air(
-		{x = pos.x - r, y = pos.y - 1, z = pos.z - r},
-		{x = pos.x + r, y = pos.y + 2, z = pos.z + r},
-		{"group:soil"})
+			{x = pos.x - r, y = pos.y - 1, z = pos.z - r},
+			{x = pos.x + r, y = pos.y + 2, z = pos.z + r},
+			{"group:soil", "ethereal:dry_dirt"})
 
 	for n = 1, #res do
 		minetest.swap_node(res[n], {name = "farming:soil"})

mods/farming/init.lua

@@ -12,7 +12,7 @@ local S = minetest.get_translator("farming")
 
 farming = {
 	mod = "redo",
-	version = "20240924",
+	version = "20250417",
 	path = minetest.get_modpath("farming"),
 	select = {type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5}},
 	select_final = {type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -2.5/16, 0.5}},
@@ -23,49 +23,6 @@ farming = {
 	mtg = minetest.get_modpath("default"),
 	eth = minetest.get_modpath("ethereal"),
 	mcl = minetest.get_modpath("mcl_core"),
-	sounds = {},
-	register_decoration = function(crop,steps,alt_source)
-		biomes = asuna.features.crops[crop]
-		if not biomes then
-			return
-		end
-
-		local decor
-		if alt_source then
-			decor = alt_source
-		else
-			decor = {}
-			for i = 0, (steps > 4 and 2 or 0) do
-				decor[i + 1] = "farming:" .. crop .. "_" .. (steps - i)
-			end
-		end
-
-		local chars = {crop:byte()}
-		local seed = 11111
-		for _,c in ipairs(chars) do
-			seed = seed + c
-		end
-		seed = seed + #crop
-
-		minetest.register_decoration(biomes.inject_decoration({
-			name = "farming:" .. crop,
-			deco_type = "simple",
-			place_on = "group:soil",
-			sidelen = 8,
-			noise_params = {
-				offset = -0.4125,
-				scale = 0.3575,
-				spread = {x = 14, y = 14, z = 14},
-				seed = seed,
-				octaves = 2,
-				persist = 0.62,
-				lacunarity = 0.675,
-			},
-			y_max = 31000,
-			y_min = 1,
-			decoration = decor,
-		}))
-	end,
 	mcl_hardness = 0.01,
 	translate = S
 }
@@ -338,6 +295,23 @@ end)
 -- Just in case a growing type or added node is missed (also catches existing
 -- nodes added to map before timers were incorporated).
 
+minetest.register_lbm({
+	label = "Start crop timer",
+	name = "farming:start_crop_timer",
+	nodenames = {"group:growing"},
+	run_at_every_load = false,
+
+	action = function(pos, node, dtime_s)
+
+		local timer = minetest.get_node_timer(pos)
+
+		if timer:is_started() then return end
+
+		farming.start_seed_timer(pos)
+	end
+})
+
+--[[
 minetest.register_abm({
 	label = "Start crop timer",
 	nodenames = {"group:growing"},
@@ -376,7 +350,7 @@ minetest.register_abm({
 			farming.handle_growth(pos, node) -- start normal crop timer
 		end
 	end
-})
+})]]
 
 -- default check crop is on wet soil
 
@@ -559,7 +533,7 @@ end
 
 -- Function to register plants (default farming compatibility)
 
-farming.register_plant = function(name, def)
+function farming.register_plant(name, def)
 
 	if not def.steps then return nil end
 
@@ -599,7 +573,7 @@ farming.register_plant = function(name, def)
 			local def = minetest.registered_nodes[mname .. ":" .. pname .. "_1"]
 
 			if def then
-				minetest.swap_node(pos, {name = def.next_plant, param2 = def.place_param2})
+				minetest.set_node(pos, {name = def.name, param2 = def.place_param2})
 			end
 		end,
 

mods/farming/item_food.lua

@@ -2,27 +2,9 @@
 local S = minetest.get_translator("farming")
 local a = farming.recipe_items
 
-local function register_craftitem(condition,eatable,name,def)
-	if condition then
-		core.register_craftitem(name,def)
-		if eatable then
-			farming.add_eatable(eatable)
-		end
-	end
-end
-
-local function register_node(condition,eatable,name,def)
-	if condition then
-		core.register_node(name,def)
-		if eatable then
-			farming.add_eatable(eatable)
-		end
-	end
-end
-
 -- Flour
 
-register_craftitem(true,nil,"farming:flour", {
+minetest.register_craftitem("farming:flour", {
 	description = S("Flour"),
 	inventory_image = "farming_flour.png",
 	groups = {food_flour = 1, flammable = 1}
@@ -30,16 +12,18 @@ register_craftitem(true,nil,"farming:flour", {
 
 -- Garlic bulb
 
-register_craftitem(farming.garlic,1,"farming:garlic", {
+minetest.register_craftitem("farming:garlic", {
 	description = S("Garlic"),
 	inventory_image = "crops_garlic.png",
 	on_use = minetest.item_eat(1),
 	groups = {food_garlic = 1, compostability = 55}
 })
 
+farming.add_eatable("farming:garlic", 1)
+
 -- Garlic braid
 
-register_node(farming.garlic,nil,"farming:garlic_braid", {
+minetest.register_node("farming:garlic_braid", {
 	description = S("Garlic Braid"),
 	inventory_image = "crops_garlic_braid.png",
 	wield_image = "crops_garlic_braid.png",
@@ -65,25 +49,29 @@ register_node(farming.garlic,nil,"farming:garlic_braid", {
 
 -- Corn on the cob (texture by TenPlus1)
 
-register_craftitem(farming.corn,5,"farming:corn_cob", {
+minetest.register_craftitem("farming:corn_cob", {
 	description = S("Corn on the Cob"),
 	inventory_image = "farming_corn_cob.png",
 	groups = {compostability = 65, food_corn_cooked = 1},
 	on_use = minetest.item_eat(5)
 })
 
+farming.add_eatable("farming:corn_cob", 5)
+
 -- Popcorn
 
-register_craftitem(farming.corn,4,"farming:popcorn", {
+minetest.register_craftitem("farming:popcorn", {
 	description = S("Popcorn"),
 	inventory_image = "farming_popcorn.png",
 	groups = {compostability = 55, food_popcorn = 1},
 	on_use = minetest.item_eat(4)
 })
 
+farming.add_eatable("farming:popcorn", 4)
+
 -- Cornstarch
 
-register_craftitem(farming.corn,nil,"farming:cornstarch", {
+minetest.register_craftitem("farming:cornstarch", {
 	description = S("Cornstarch"),
 	inventory_image = "farming_cornstarch.png",
 	groups = {food_cornstarch = 1, food_gelatin = 1, flammable = 2, compostability = 65}
@@ -91,7 +79,7 @@ register_craftitem(farming.corn,nil,"farming:cornstarch", {
 
 -- Cup of coffee
 
-register_node(farming.coffee,2,"farming:coffee_cup", {
+minetest.register_node("farming:coffee_cup", {
 	description = S("Cup of Coffee"),
 	drawtype = "torchlike",
 	tiles = {"farming_coffee_cup.png"},
@@ -109,20 +97,24 @@ register_node(farming.coffee,2,"farming:coffee_cup", {
 	sounds = farming.node_sound_glass_defaults()
 })
 
+farming.add_eatable("farming:coffee_cup", 2)
+
 minetest.register_alias("farming:coffee_cup_hot", "farming:coffee_cup")
 minetest.register_alias("farming:drinking_cup", "vessels:drinking_glass")
 
 -- Bar of of dark chocolate (thx to Ice Pandora for her deviantart.com chocolate tutorial)
 
-register_craftitem(farming.cocoa,3,"farming:chocolate_dark", {
+minetest.register_craftitem("farming:chocolate_dark", {
 	description = S("Bar of Dark Chocolate"),
 	inventory_image = "farming_chocolate_dark.png",
 	on_use = minetest.item_eat(3)
 })
 
+farming.add_eatable("farming:chocolate_dark", 3)
+
 -- Chocolate block (not edible)
 
-register_node(farming.cocoa,nil,"farming:chocolate_block", {
+minetest.register_node("farming:chocolate_block", {
 	description = S("Chocolate Block"),
 	tiles = {"farming_chocolate_block.png"},
 	is_ground_content = false,
@@ -132,16 +124,18 @@ register_node(farming.cocoa,nil,"farming:chocolate_block", {
 
 -- Bowl of chili
 
-register_craftitem(farming.chili,8,"farming:chili_bowl", {
+minetest.register_craftitem("farming:chili_bowl", {
 	description = S("Bowl of Chili"),
 	inventory_image = "farming_chili_bowl.png",
 	on_use = minetest.item_eat(8, a.bowl),
 	groups = {compostability = 65}
 })
 
+farming.add_eatable("farming:chili_bowl", 8)
+
 -- Chili powder
 
-register_craftitem(farming.chili,nil,"farming:chili_powder", {
+minetest.register_craftitem("farming:chili_powder", {
 	description = S("Chili Powder"),
 	on_use = minetest.item_eat(-1),
 	inventory_image = "farming_chili_powder.png",
@@ -150,70 +144,84 @@ register_craftitem(farming.chili,nil,"farming:chili_powder", {
 
 -- Carrot juice
 
-register_craftitem(farming.carrot,4,"farming:carrot_juice", {
+minetest.register_craftitem("farming:carrot_juice", {
 	description = S("Carrot Juice"),
 	inventory_image = "farming_carrot_juice.png",
 	on_use = minetest.item_eat(4, "vessels:drinking_glass"),
 	groups = {vessel = 1, drink = 1}
 })
 
+farming.add_eatable("farming:carrot_juice", 4)
+
 -- Blueberry Pie
 
-register_craftitem(farming.blueberry or core.registered_items["default:blueberries"],6,"farming:blueberry_pie", {
+minetest.register_craftitem("farming:blueberry_pie", {
 	description = S("Blueberry Pie"),
 	inventory_image = "farming_blueberry_pie.png",
 	on_use = minetest.item_eat(6),
 	groups = {compostability = 75}
 })
 
+farming.add_eatable("farming:blueberry_pie", 6)
+
 -- Blueberry muffin (thanks to sosogirl123 @ deviantart.com for muffin image)
 
-register_craftitem(farming.blueberry or core.registered_items["default:blueberries"],2,"farming:muffin_blueberry", {
+minetest.register_craftitem("farming:muffin_blueberry", {
 	description = S("Blueberry Muffin"),
 	inventory_image = "farming_blueberry_muffin.png",
 	on_use = minetest.item_eat(2),
 	groups = {compostability = 65}
 })
 
+farming.add_eatable("farming:muffin_blueberry", 2)
+
 -- Tomato soup
 
-register_craftitem(farming.tomato,8,"farming:tomato_soup", {
+minetest.register_craftitem("farming:tomato_soup", {
 	description = S("Tomato Soup"),
 	inventory_image = "farming_tomato_soup.png",
 	groups = {compostability = 65, drink = 1},
 	on_use = minetest.item_eat(8, "farming:bowl")
 })
 
+farming.add_eatable("farming:tomato_soup", 8)
+
 -- sliced bread
 
-register_craftitem(true,1,"farming:bread_slice", {
+minetest.register_craftitem("farming:bread_slice", {
 	description = S("Sliced Bread"),
 	inventory_image = "farming_bread_slice.png",
 	on_use = minetest.item_eat(1),
 	groups = {food_bread_slice = 1, compostability = 65}
 })
 
+farming.add_eatable("farming:bread_slice", 1)
+
 -- toast
 
-register_craftitem(true,1,"farming:toast", {
+minetest.register_craftitem("farming:toast", {
 	description = S("Toast"),
 	inventory_image = "farming_toast.png",
 	on_use = minetest.item_eat(1),
 	groups = {food_toast = 1, compostability = 65}
 })
 
+farming.add_eatable("farming:toast", 1)
+
 -- toast sandwich
 
-register_craftitem(true,4,"farming:toast_sandwich", {
+minetest.register_craftitem("farming:toast_sandwich", {
 	description = S("Toast Sandwich"),
 	inventory_image = "farming_toast_sandwich.png",
 	on_use = minetest.item_eat(4),
 	groups = {compostability = 85}
 })
 
+farming.add_eatable("farming:toast_sandwich", 4)
+
 -- glass of water
 
-register_craftitem(true,nil,"farming:glass_water", {
+minetest.register_craftitem("farming:glass_water", {
 	description = S("Glass of Water"),
 	inventory_image = "farming_water_glass.png",
 	groups = {food_glass_water = 1, flammable = 3, vessel = 1}
@@ -221,7 +229,7 @@ register_craftitem(true,nil,"farming:glass_water", {
 
 -- Sugar cube
 
-register_node(true,nil,"farming:sugar_cube", {
+minetest.register_node("farming:sugar_cube", {
 	description = S("Sugar Cube"),
 	tiles = {"farming_sugar_cube.png"},
 	groups = {shovely = 1, handy = 1, crumbly = 2},
@@ -234,7 +242,7 @@ register_node(true,nil,"farming:sugar_cube", {
 
 -- Sugar caramel
 
-register_craftitem(true,nil,"farming:caramel", {
+minetest.register_craftitem("farming:caramel", {
 	description = S("Caramel"),
 	inventory_image = "farming_caramel.png",
 	groups = {compostability = 40}
@@ -242,7 +250,7 @@ register_craftitem(true,nil,"farming:caramel", {
 
 -- Salt
 
-register_node(true,nil,"farming:salt", {
+minetest.register_node("farming:salt", {
 	description = S("Salt"),
 	inventory_image = "farming_salt.png",
 	wield_image = "farming_salt.png",
@@ -300,7 +308,7 @@ register_node(true,nil,"farming:salt", {
 
 -- Salt Crystal
 
-register_node(true,nil,"farming:salt_crystal", {
+minetest.register_node("farming:salt_crystal", {
 	description = S("Salt crystal"),
 	inventory_image = "farming_salt_crystal.png",
 	wield_image = "farming_salt_crystal.png",
@@ -321,7 +329,7 @@ register_node(true,nil,"farming:salt_crystal", {
 
 -- Mayonnaise
 
-register_node(true,3,"farming:mayonnaise", {
+minetest.register_node("farming:mayonnaise", {
 	description = S("Mayonnaise"),
 	drawtype = "plantlike",
 	tiles = {"farming_mayo.png"},
@@ -342,9 +350,11 @@ register_node(true,3,"farming:mayonnaise", {
 	sounds = farming.node_sound_glass_defaults()
 })
 
+farming.add_eatable("farming:mayonnaise", 3)
+
 -- Rose Water
 
-register_node(true,nil,"farming:rose_water", {
+minetest.register_node("farming:rose_water", {
 	description = S("Rose Water"),
 	inventory_image = "farming_rose_water.png",
 	wield_image = "farming_rose_water.png",
@@ -364,75 +374,91 @@ register_node(true,nil,"farming:rose_water", {
 
 -- Turkish Delight
 
-register_craftitem(true,2,"farming:turkish_delight", {
+minetest.register_craftitem("farming:turkish_delight", {
 	description = S("Turkish Delight"),
 	inventory_image = "farming_turkish_delight.png",
 	groups = {compostability = 85},
 	on_use = minetest.item_eat(2)
 })
 
+farming.add_eatable("farming:turkish_delight", 2)
+
 -- Garlic Bread
 
-register_craftitem(farming.garlic,2,"farming:garlic_bread", {
+minetest.register_craftitem("farming:garlic_bread", {
 	description = S("Garlic Bread"),
 	inventory_image = "farming_garlic_bread.png",
 	groups = {compostability = 65},
 	on_use = minetest.item_eat(2)
 })
 
+farming.add_eatable("farming:garlic_bread", 2)
+
 -- Donuts (thanks to Bockwurst for making the donut images)
 
-register_craftitem(true,4,"farming:donut", {
+minetest.register_craftitem("farming:donut", {
 	description = S("Donut"),
 	inventory_image = "farming_donut.png",
 	on_use = minetest.item_eat(4),
 	groups = {compostability = 65}
 })
 
-register_craftitem(farming.cocoa,6,"farming:donut_chocolate", {
+farming.add_eatable("farming:donut", 4)
+
+minetest.register_craftitem("farming:donut_chocolate", {
 	description = S("Chocolate Donut"),
 	inventory_image = "farming_donut_chocolate.png",
 	on_use = minetest.item_eat(6),
 	groups = {compostability = 65}
 })
 
-register_craftitem(true,6,"farming:donut_apple", {
+farming.add_eatable("farming:donut_chocolate", 6)
+
+minetest.register_craftitem("farming:donut_apple", {
 	description = S("Apple Donut"),
 	inventory_image = "farming_donut_apple.png",
 	on_use = minetest.item_eat(6),
 	groups = {compostability = 65}
 })
 
+farming.add_eatable("farming:donut_apple", 6)
+
 -- Porridge Oats
 
-register_craftitem(farming.grains and farming.soy,6,"farming:porridge", {
+minetest.register_craftitem("farming:porridge", {
 	description = S("Porridge"),
 	inventory_image = "farming_porridge.png",
 	on_use = minetest.item_eat(6, a.bowl),
 	groups = {compostability = 65}
 })
 
+farming.add_eatable("farming:porridge", 6)
+
 -- Jaffa Cake
 
-register_craftitem(farming.soy,6,"farming:jaffa_cake", {
+minetest.register_craftitem("farming:jaffa_cake", {
 	description = S("Jaffa Cake"),
 	inventory_image = "farming_jaffa_cake.png",
 	on_use = minetest.item_eat(6),
 	groups = {compostability = 65}
 })
 
+farming.add_eatable("farming:jaffa_cake", 6)
+
 -- Apple Pie
 
-register_craftitem(true,6,"farming:apple_pie", {
+minetest.register_craftitem("farming:apple_pie", {
 	description = S("Apple Pie"),
 	inventory_image = "farming_apple_pie.png",
 	on_use = minetest.item_eat(6),
 	groups = {compostability = 75}
 })
 
+farming.add_eatable("farming:apple_pie", 6)
+
 -- Cactus Juice
 
-register_craftitem(true,1,"farming:cactus_juice", {
+minetest.register_craftitem("farming:cactus_juice", {
 	description = S("Cactus Juice"),
 	inventory_image = "farming_cactus_juice.png",
 	groups = {vessel = 1, drink = 1, compostability = 55},
@@ -449,9 +475,11 @@ register_craftitem(true,1,"farming:cactus_juice", {
 	end
 })
 
+farming.add_eatable("farming:cactus_juice", 1)
+
 -- Pasta
 
-register_craftitem(true,nil,"farming:pasta", {
+minetest.register_craftitem("farming:pasta", {
 	description = S("Pasta"),
 	inventory_image = "farming_pasta.png",
 	groups = {compostability = 65, food_pasta = 1}
@@ -459,106 +487,128 @@ register_craftitem(true,nil,"farming:pasta", {
 
 -- Mac & Cheese
 
-register_craftitem(true,6,"farming:mac_and_cheese", {
+minetest.register_craftitem("farming:mac_and_cheese", {
 	description = S("Mac & Cheese"),
 	inventory_image = "farming_mac_and_cheese.png",
 	on_use = minetest.item_eat(6, a.bowl),
 	groups = {compostability = 65}
 })
 
+farming.add_eatable("farming:mac_and_cheese", 6)
+
 -- Spaghetti
 
-register_craftitem(farming.garlic and farming.tomato,8,"farming:spaghetti", {
+minetest.register_craftitem("farming:spaghetti", {
 	description = S("Spaghetti"),
 	inventory_image = "farming_spaghetti.png",
 	on_use = minetest.item_eat(8),
 	groups = {compostability = 65}
 })
 
+farming.add_eatable("farming:spaghetti", 8)
+
 -- Korean Bibimbap
 
-register_craftitem(farming.chili and farming.rice and farming.chili and farming.cabbage,8,"farming:bibimbap", {
+minetest.register_craftitem("farming:bibimbap", {
 	description = S("Bibimbap"),
 	inventory_image = "farming_bibimbap.png",
 	on_use = minetest.item_eat(8, a.bowl),
 	groups = {compostability = 65}
 })
 
+farming.add_eatable("farming:bibimbap", 8)
+
 -- Burger
 
-register_craftitem(farming.lettuce and farming.tomato,16,"farming:burger", {
+minetest.register_craftitem("farming:burger", {
 	description = S("Burger"),
 	inventory_image = "farming_burger.png",
 	on_use = minetest.item_eat(16),
 	groups = {compostability = 95}
 })
 
+farming.add_eatable("farming:burger", 16)
+
 -- Salad
 
-register_craftitem(farming.lettuce and farming.tomato,8,"farming:salad", {
+minetest.register_craftitem("farming:salad", {
 	description = S("Salad"),
 	inventory_image = "farming_salad.png",
 	on_use = minetest.item_eat(8, a.bowl),
 	groups = {compostability = 45}
 })
 
+farming.add_eatable("farming:salad", 8)
+
 -- Triple Berry Smoothie
 
-register_craftitem(farming.raspberry and farming.blackberry and farming.strawberry,6,"farming:smoothie_berry", {
+minetest.register_craftitem("farming:smoothie_berry", {
 	description = S("Triple Berry Smoothie"),
 	inventory_image = "farming_berry_smoothie.png",
 	on_use = minetest.item_eat(6, "vessels:drinking_glass"),
 	groups = {vessel = 1, drink = 1, compostability = 65}
 })
 
+farming.add_eatable("farming:smoothie_berry", 6)
+
 -- Patatas a la importancia
 
-register_craftitem(farming.garlic and farming.parsley and farming.potato and farming.onion,8,"farming:spanish_potatoes", {
+minetest.register_craftitem("farming:spanish_potatoes", {
 	description = S("Spanish Potatoes"),
 	inventory_image = "farming_spanish_potatoes.png",
 	on_use = minetest.item_eat(8, a.bowl),
 	groups = {compostability = 65}
 })
 
+farming.add_eatable("farming:spanish_potatoes", 8)
+
 -- Potato omelette
 
-register_craftitem(farming.onion and farming.potato,6,"farming:potato_omelet", {
+minetest.register_craftitem("farming:potato_omelet", {
 	description = S("Potato omelette"),
 	inventory_image = "farming_potato_omelet.png",
 	on_use = minetest.item_eat(6, a.bowl),
 	groups = {compostability = 65}
 })
 
+farming.add_eatable("farming:potato_omelet", 6)
+
 -- Paella
 
-register_craftitem(farming.peas and farming.pepper and farming.rice,8,"farming:paella", {
+minetest.register_craftitem("farming:paella", {
 	description = S("Paella"),
 	inventory_image = "farming_paella.png",
 	on_use = minetest.item_eat(8, a.bowl),
 	groups = {compostability = 65}
 })
 
+farming.add_eatable("farming:paella", 8)
+
 -- Vanilla Flan
 
-register_craftitem(farming.vanilla and farming.soy,6,"farming:flan", {
+minetest.register_craftitem("farming:flan", {
 	description = S("Vanilla Flan"),
 	inventory_image = "farming_vanilla_flan.png",
 	on_use = minetest.item_eat(6),
 	groups = {compostability = 65}
 })
 
+farming.add_eatable("farming:flan", 6)
+
 -- Vegan Cheese
 
-register_craftitem(farming.corn and farming.pepper and farming.soy,2,"farming:cheese_vegan", {
+minetest.register_craftitem("farming:cheese_vegan", {
 	description = S("Vegan Cheese"),
 	inventory_image = "farming_cheese_vegan.png",
 	on_use = minetest.item_eat(2),
 	groups = {compostability = 65, food_cheese = 1}
 })
 
+farming.add_eatable("farming:cheese_vegan", 2)
+
 -- Vegan Butter
 
-register_craftitem(farming.soy and farming.sunflower,nil,"farming:butter_vegan", {
+minetest.register_craftitem("farming:butter_vegan", {
 	description = S("Vegan Butter"),
 	inventory_image = "farming_vegan_butter.png",
 	groups = {food_butter = 1}
@@ -566,68 +616,82 @@ register_craftitem(farming.soy and farming.sunflower,nil,"farming:butter_vegan",
 
 -- Onigiri
 
-register_craftitem(farming.rice,2,"farming:onigiri", {
+minetest.register_craftitem("farming:onigiri", {
 	description = S("Onigiri"),
 	inventory_image = "farming_onigiri.png",
 	on_use = minetest.item_eat(2),
 	groups = {compostability = 65}
 })
 
+farming.add_eatable("farming:onigiri", 2)
+
 -- Gyoza
 
-register_craftitem(farming.cabbage and farming.garlic and farming.onion,4,"farming:gyoza", {
+minetest.register_craftitem("farming:gyoza", {
 	description = S("Gyoza"),
 	inventory_image = "farming_gyoza.png",
 	on_use = minetest.item_eat(4),
 	groups = {compostability = 65}
 })
 
+farming.add_eatable("farming:gyoza", 4)
+
 -- Mochi
 
-register_craftitem(farming.rice,3,"farming:mochi", {
+minetest.register_craftitem("farming:mochi", {
 	description = S("Mochi"),
 	inventory_image = "farming_mochi.png",
 	on_use = minetest.item_eat(3),
 	groups = {compostability = 65}
 })
 
+farming.add_eatable("farming:mochi", 3)
+
 -- Gingerbread Man
 
-register_craftitem(farming.ginger,2,"farming:gingerbread_man", {
+minetest.register_craftitem("farming:gingerbread_man", {
 	description = S("Gingerbread Man"),
 	inventory_image = "farming_gingerbread_man.png",
 	on_use = minetest.item_eat(2),
 	groups = {compostability = 85}
 })
 
+farming.add_eatable("farming:gingerbread_man", 2)
+
 -- Mint tea
-register_craftitem(farming.mint,2,"farming:mint_tea", {
+minetest.register_craftitem("farming:mint_tea", {
 	description = S("Mint Tea"),
 	inventory_image = "farming_mint_tea.png",
 	on_use = minetest.item_eat(2, a.drinking_glass),
 	groups = {drink = 1}
 })
 
+farming.add_eatable("farming:mint_tea", 2)
+
 -- Onion soup
-register_craftitem(farming.onion,6,"farming:onion_soup", {
+minetest.register_craftitem("farming:onion_soup", {
 	description = S("Onion Soup"),
 	inventory_image = "farming_onion_soup.png",
 	groups = {compostability = 65, drink = 1},
 	on_use = minetest.item_eat(6, a.bowl)
 })
 
+farming.add_eatable("farming:onion_soup", 6)
+
 -- Pea soup
 
-register_craftitem(farming.peas,4,"farming:pea_soup", {
+minetest.register_craftitem("farming:pea_soup", {
 	description = S("Pea Soup"),
 	inventory_image = "farming_pea_soup.png",
 	groups = {compostability = 65, drink = 1},
 	on_use = minetest.item_eat(4, a.bowl)
 })
 
+farming.add_eatable("farming:pea_soup", 4)
+
 -- Ground pepper
 
-register_node(farming.pepper,nil,"farming:pepper_ground", {
+minetest.register_node("farming:pepper_ground", {
 	description = S("Ground Pepper"),
 	inventory_image = "crops_pepper_ground.png",
 	wield_image = "crops_pepper_ground.png",
@@ -648,67 +712,79 @@ register_node(farming.pepper,nil,"farming:pepper_ground", {
 
 -- pineapple ring
 
-register_craftitem(farming.pineapple,1,"farming:pineapple_ring", {
+minetest.register_craftitem("farming:pineapple_ring", {
 	description = S("Pineapple Ring"),
 	inventory_image = "farming_pineapple_ring.png",
 	groups = {food_pineapple_ring = 1, compostability = 45},
 	on_use = minetest.item_eat(1)
 })
 
+farming.add_eatable("farming:pineapple_ring", 1)
+
 -- Pineapple juice
 
-register_craftitem(farming.pineapple,4,"farming:pineapple_juice", {
+minetest.register_craftitem("farming:pineapple_juice", {
 	description = S("Pineapple Juice"),
 	inventory_image = "farming_pineapple_juice.png",
 	on_use = minetest.item_eat(4, "vessels:drinking_glass"),
 	groups = {vessel = 1, drink = 1, compostability = 35}
 })
 
+farming.add_eatable("farming:pineapple_juice", 4)
+
 -- Potato & cucumber Salad
 
-register_craftitem(farming.potato,10,"farming:potato_salad", {
+minetest.register_craftitem("farming:potato_salad", {
 	description = S("Cucumber and Potato Salad"),
 	inventory_image = "farming_potato_salad.png",
 	on_use = minetest.item_eat(10, "farming:bowl")
 })
 
+farming.add_eatable("farming:potato_salad", 10)
+
 -- Pumpkin dough
 
-register_craftitem(farming.pumpkin,nil,"farming:pumpkin_dough", {
+minetest.register_craftitem("farming:pumpkin_dough", {
 	description = S("Pumpkin Dough"),
 	inventory_image = "farming_pumpkin_dough.png"
 })
 
 -- Pumpkin bread
 
-register_craftitem(farming.pumpkin,8,"farming:pumpkin_bread", {
+minetest.register_craftitem("farming:pumpkin_bread", {
 	description = S("Pumpkin Bread"),
 	inventory_image = "farming_pumpkin_bread.png",
 	on_use = minetest.item_eat(8),
 	groups = {food_bread = 1}
 })
 
+farming.add_eatable("farming:pumpkin_bread", 8)
+
 -- Raspberry smoothie
 
-register_craftitem(farming.raspberry,2,"farming:smoothie_raspberry", {
+minetest.register_craftitem("farming:smoothie_raspberry", {
 	description = S("Raspberry Smoothie"),
 	inventory_image = "farming_raspberry_smoothie.png",
 	on_use = minetest.item_eat(2, "vessels:drinking_glass"),
 	groups = {vessel = 1, drink = 1, compostability = 65}
 })
 
+farming.add_eatable("farming:smoothie_raspberry", 2)
+
 -- Rhubarb pie
 
-register_craftitem(farming.rhubarb,6,"farming:rhubarb_pie", {
+minetest.register_craftitem("farming:rhubarb_pie", {
 	description = S("Rhubarb Pie"),
 	inventory_image = "farming_rhubarb_pie.png",
 	on_use = minetest.item_eat(6),
 	groups = {compostability = 65}
 })
 
+farming.add_eatable("farming:rhubarb_pie", 6)
+
 -- Rice flour
 
-register_craftitem(farming.rice,nil,"farming:rice_flour", {
+minetest.register_craftitem("farming:rice_flour", {
 	description = S("Rice Flour"),
 	inventory_image = "farming_rice_flour.png",
 	groups = {food_rice_flour = 1, flammable = 1, compostability = 65}
@@ -716,16 +792,18 @@ register_craftitem(farming.rice,nil,"farming:rice_flour", {
 
 -- Rice bread
 
-register_craftitem(farming.rice,5,"farming:rice_bread", {
+minetest.register_craftitem("farming:rice_bread", {
 	description = S("Rice Bread"),
 	inventory_image = "farming_rice_bread.png",
 	on_use = minetest.item_eat(5),
 	groups = {food_rice_bread = 1, compostability = 65}
 })
 
+farming.add_eatable("farming:rice_bread", 5)
+
 -- Multigrain flour
 
-register_craftitem(farming.grains,nil,"farming:flour_multigrain", {
+minetest.register_craftitem("farming:flour_multigrain", {
 	description = S("Multigrain Flour"),
 	inventory_image = "farming_flour_multigrain.png",
 	groups = {food_flour = 1, flammable = 1},
@@ -734,16 +812,18 @@ register_craftitem(farming.grains,nil,"farming:flour_multigrain", {
 
 -- Multigrain bread
 
-register_craftitem(farming.grains,7,"farming:bread_multigrain", {
+minetest.register_craftitem("farming:bread_multigrain", {
 	description = S("Multigrain Bread"),
 	inventory_image = "farming_bread_multigrain.png",
 	on_use = minetest.item_eat(7),
 	groups = {food_bread = 1, compostability = 65}
 })
 
+farming.add_eatable("farming:bread_multigrain", 7)
+
 -- Soy sauce
 
-register_node(farming.soy,nil,"farming:soy_sauce", {
+minetest.register_node("farming:soy_sauce", {
 	description = S("Soy Sauce"),
 	drawtype = "plantlike",
 	tiles = {"farming_soy_sauce.png"},
@@ -764,7 +844,7 @@ register_node(farming.soy,nil,"farming:soy_sauce", {
 
 -- Soy milk
 
-register_node(farming.soy,2,"farming:soy_milk", {
+minetest.register_node("farming:soy_milk", {
 	description = S("Soy Milk"),
 	drawtype = "plantlike",
 	tiles = {"farming_soy_milk_glass.png"},
@@ -784,9 +864,11 @@ register_node(farming.soy,2,"farming:soy_milk", {
 	sounds = farming.node_sound_glass_defaults()
 })
 
+farming.add_eatable("farming:soy_milk", 2)
+
 -- Tofu
 
-register_craftitem(farming.soy,3,"farming:tofu", {
+minetest.register_craftitem("farming:tofu", {
 	description = S("Tofu"),
 	inventory_image = "farming_tofu.png",
 	groups = {
@@ -795,27 +877,33 @@ register_craftitem(farming.soy,3,"farming:tofu", {
 	on_use = minetest.item_eat(3)
 })
 
+farming.add_eatable("farming:tofu", 3)
+
 -- Cooked tofu
 
-register_craftitem(farming.soy,6,"farming:tofu_cooked", {
+minetest.register_craftitem("farming:tofu_cooked", {
 	description = S("Cooked Tofu"),
 	inventory_image = "farming_tofu_cooked.png",
 	groups = {food_meat = 1, compostability = 65},
 	on_use = minetest.item_eat(6)
 })
 
+farming.add_eatable("farming:tofu_cooked", 6)
+
 -- Toasted sunflower seeds
 
-register_craftitem(farming.sunflower,1,"farming:sunflower_seeds_toasted", {
+minetest.register_craftitem("farming:sunflower_seeds_toasted", {
 	description = S("Toasted Sunflower Seeds"),
 	inventory_image = "farming_sunflower_seeds_toasted.png",
 	groups = {food_sunflower_seeds_toasted = 1, compostability = 65},
 	on_use = minetest.item_eat(1)
 })
 
+farming.add_eatable("farming:sunflower_seeds_toasted", 1)
+
 -- Sunflower oil
 
-register_node(farming.sunflower,nil,"farming:sunflower_oil", {
+minetest.register_node("farming:sunflower_oil", {
 	description = S("Bottle of Sunflower Oil"),
 	drawtype = "plantlike",
 	tiles = {"farming_sunflower_oil.png"},
@@ -836,16 +924,18 @@ register_node(farming.sunflower,nil,"farming:sunflower_oil", {
 
 -- Sunflower seed bread
 
-register_craftitem(farming.sunflower,8,"farming:sunflower_bread", {
+minetest.register_craftitem("farming:sunflower_bread", {
 	description = S("Sunflower Seed Bread"),
 	inventory_image = "farming_sunflower_bread.png",
 	on_use = minetest.item_eat(8),
 	groups = {food_bread = 1}
 })
 
+farming.add_eatable("farming:sunflower_bread", 8)
+
 -- Vanilla extract
 
-register_node(farming.vanilla and farming.corn,nil,"farming:vanilla_extract", {
+minetest.register_node("farming:vanilla_extract", {
 	description = S("Vanilla Extract"),
 	drawtype = "plantlike",
 	tiles = {"farming_vanilla_extract.png"},
@@ -863,28 +953,32 @@ register_node(farming.vanilla and farming.corn,nil,"farming:vanilla_extract", {
 
 -- Jerusalem Artichokes with miso butter
 
-register_craftitem(farming.artichoke and farming.soy and farming.garlic,11,"farming:jerusalem_artichokes", {
+minetest.register_craftitem("farming:jerusalem_artichokes", {
 	description = S("Jerusalem Artichokes"),
 	inventory_image = "farming_jerusalem_artichokes.png",
 	on_use = minetest.item_eat(11, a.bowl)
 })
 
+farming.add_eatable("ethereal:jerusalem_artichokes", 11)
+
 --= Foods we shouldn't add when using Mineclonia/VoxeLibre
 
 if not farming.mcl then
 
 	-- Bread
 
-	register_craftitem(true,5,"farming:bread", {
+	minetest.register_craftitem("farming:bread", {
 		description = S("Bread"),
 		inventory_image = "farming_bread.png",
 		on_use = minetest.item_eat(5),
 		groups = {food_bread = 1}
 	})
 
+	farming.add_eatable("farming:bread", 5)
+
 	-- Cocoa beans
 
-	register_craftitem(farming.cocoa,nil,"farming:cocoa_beans", {
+	minetest.register_craftitem("farming:cocoa_beans", {
 		description = S("Cocoa Beans"),
 		inventory_image = "farming_cocoa_beans.png",
 		groups = {compostability = 65, food_cocoa = 1, flammable = 2}
@@ -892,32 +986,38 @@ if not farming.mcl then
 
 	-- Chocolate cookie
 
-	register_craftitem(farming.cocoa,2,"farming:cookie", {
+	minetest.register_craftitem("farming:cookie", {
 		description = S("Cookie"),
 		inventory_image = "farming_cookie.png",
 		on_use = minetest.item_eat(2)
 	})
 
+	farming.add_eatable("farming:cookie", 2)
+
 	-- Golden carrot
 
-	register_craftitem(farming.carrot,10,"farming:carrot_gold", {
+	minetest.register_craftitem("farming:carrot_gold", {
 		description = S("Golden Carrot"),
 		inventory_image = "farming_carrot_gold.png",
 		on_use = minetest.item_eat(10)
 	})
 
+	farming.add_eatable("farming:carrot_gold", 10)
+
 	-- Beetroot soup
 
-	register_craftitem(farming.beetroot,6,"farming:beetroot_soup", {
+	minetest.register_craftitem("farming:beetroot_soup", {
 		description = S("Beetroot Soup"),
 		inventory_image = "farming_beetroot_soup.png",
 		on_use = minetest.item_eat(6, "farming:bowl"),
 		groups = {drink = 1}
 	})
 
+	farming.add_eatable("farming:beetroot_soup", 6)
+
 	-- Sugar
 
-	register_craftitem(true,nil,"farming:sugar", {
+	minetest.register_craftitem("farming:sugar", {
 		description = S("Sugar"),
 		inventory_image = "farming_sugar.png",
 		groups = {food_sugar = 1, flammable = 3}
@@ -925,9 +1025,11 @@ if not farming.mcl then
 
 	-- Baked potato
 
-	register_craftitem(farming.potato,6,"farming:baked_potato", {
+	minetest.register_craftitem("farming:baked_potato", {
 		description = S("Baked Potato"),
 		inventory_image = "farming_baked_potato.png",
 		on_use = minetest.item_eat(6)
 	})
+
+	farming.add_eatable("farming:baked_potato", 6)
 end

mods/farming/item_non_food.lua

@@ -1,21 +1,9 @@
 
 local S = minetest.get_translator("farming")
 
-local function register_craftitem(condition,name,def)
-	if condition then
-		core.register_craftitem(name,def)
-	end
-end
-
-local function register_node(condition,name,def)
-	if condition then
-		core.register_node(name,def)
-	end
-end
-
 -- saucepan
 
-register_craftitem(true,"farming:saucepan", {
+minetest.register_craftitem("farming:saucepan", {
 	description = S("Saucepan"),
 	inventory_image = "farming_saucepan.png",
 	groups = {food_saucepan = 1, flammable = 2}
@@ -23,7 +11,7 @@ register_craftitem(true,"farming:saucepan", {
 
 -- cooking pot
 
-register_craftitem(true,"farming:pot", {
+minetest.register_craftitem("farming:pot", {
 	description = S("Cooking Pot"),
 	inventory_image = "farming_pot.png",
 	groups = {food_pot = 1, flammable = 2}
@@ -31,7 +19,7 @@ register_craftitem(true,"farming:pot", {
 
 -- baking tray
 
-register_craftitem(true,"farming:baking_tray", {
+minetest.register_craftitem("farming:baking_tray", {
 	description = S("Baking Tray"),
 	inventory_image = "farming_baking_tray.png",
 	groups = {food_baking_tray = 1, flammable = 2}
@@ -39,7 +27,7 @@ register_craftitem(true,"farming:baking_tray", {
 
 -- skillet
 
-register_craftitem(true,"farming:skillet", {
+minetest.register_craftitem("farming:skillet", {
 	description = S("Skillet"),
 	inventory_image = "farming_skillet.png",
 	groups = {food_skillet = 1, flammable = 2}
@@ -47,7 +35,7 @@ register_craftitem(true,"farming:skillet", {
 
 -- mortar & pestle
 
-register_craftitem(true,"farming:mortar_pestle", {
+minetest.register_craftitem("farming:mortar_pestle", {
 	description = S("Mortar and Pestle"),
 	inventory_image = "farming_mortar_pestle.png",
 	groups = {food_mortar_pestle = 1, flammable = 2}
@@ -55,7 +43,7 @@ register_craftitem(true,"farming:mortar_pestle", {
 
 -- cutting board
 
-register_craftitem(true,"farming:cutting_board", {
+minetest.register_craftitem("farming:cutting_board", {
 	description = S("Cutting Board"),
 	inventory_image = "farming_cutting_board.png",
 	groups = {food_cutting_board = 1, flammable = 2}
@@ -63,7 +51,7 @@ register_craftitem(true,"farming:cutting_board", {
 
 -- juicer
 
-register_craftitem(true,"farming:juicer", {
+minetest.register_craftitem("farming:juicer", {
 	description = S("Juicer"),
 	inventory_image = "farming_juicer.png",
 	groups = {food_juicer = 1, flammable = 2}
@@ -71,7 +59,7 @@ register_craftitem(true,"farming:juicer", {
 
 -- glass mixing bowl
 
-register_craftitem(true,"farming:mixing_bowl", {
+minetest.register_craftitem("farming:mixing_bowl", {
 	description = S("Glass Mixing Bowl"),
 	inventory_image = "farming_mixing_bowl.png",
 	groups = {food_mixing_bowl = 1, flammable = 2}
@@ -79,7 +67,7 @@ register_craftitem(true,"farming:mixing_bowl", {
 
 -- Ethanol (thanks to JKMurray for this idea)
 
-register_node(farming.corn,"farming:bottle_ethanol", {
+minetest.register_node("farming:bottle_ethanol", {
 	description = S("Bottle of Ethanol"),
 	drawtype = "plantlike",
 	tiles = {"farming_bottle_ethanol.png"},
@@ -98,7 +86,7 @@ register_node(farming.corn,"farming:bottle_ethanol", {
 
 -- straw
 
-register_node(true,"farming:straw", {
+minetest.register_node("farming:straw", {
 	description = S("Straw"),
 	tiles = {"farming_straw.png"},
 	is_ground_content = false,
@@ -108,9 +96,45 @@ register_node(true,"farming:straw", {
 	_mcl_blast_resistance = 1
 })
 
+-- weed
+
+minetest.register_node("farming:weed", {
+	description = S("Weed"),
+	drawtype = "plantlike",
+	tiles = {"farming_weed.png"},
+	inventory_image = "farming_weed.png",
+	paramtype = "light",
+	paramtype2 = "meshoptions",
+	place_param2 = 2,
+	sunlight_propagates = true,
+	walkable = false,
+	buildable_to = true,
+	waving = 1,
+	selection_box = farming.select,
+	groups = {snappy = 3, flammable = 4, plant = 1, attached_node = 1},
+	_mcl_hardness = farming.mcl_hardness,
+	is_ground_content = false,
+	sounds = farming.node_sound_leaves_defaults()
+})
+
+-- weed bale
+
+minetest.register_node("farming:weed_bale", {
+	description = S("Weed Bale"),
+	tiles = {
+		"farming_weed_bale_top.png", "farming_weed_bale_top.png",
+		"farming_weed_bale_side.png"
+	},
+	paramtype2 = "facedir",
+	groups = {handy = 1, snappy = 3, flammable = 4, fall_damage_add_percent = -30},
+	sounds = farming.node_sound_leaves_defaults(),
+	_mcl_hardness = 0.8,
+	_mcl_blast_resistance = 1
+})
+
 -- hemp oil
 
-register_node(farming.hemp,"farming:hemp_oil", {
+minetest.register_node("farming:hemp_oil", {
 	description = S("Bottle of Hemp Oil"),
 	drawtype = "plantlike",
 	tiles = {"farming_hemp_oil.png"},
@@ -120,8 +144,7 @@ register_node(farming.hemp,"farming:hemp_oil", {
 	is_ground_content = false,
 	walkable = false,
 	selection_box = {
-		type = "fixed",
-		fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25}
+		type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25}
 	},
 	groups = {
 		food_oil = 1, vessel = 1, dig_immediate = 3, attached_node = 1,
@@ -132,7 +155,7 @@ register_node(farming.hemp,"farming:hemp_oil", {
 
 -- hemp fibre
 
-register_craftitem(farming.hemp,"farming:hemp_fibre", {
+minetest.register_craftitem("farming:hemp_fibre", {
 	description = S("Hemp Fibre"),
 	inventory_image = "farming_hemp_fibre.png",
 	groups = {compostability = 55}
@@ -140,7 +163,7 @@ register_craftitem(farming.hemp,"farming:hemp_fibre", {
 
 -- hemp block
 
-register_node(farming.hemp,"farming:hemp_block", {
+minetest.register_node("farming:hemp_block", {
 	description = S("Hemp Block"),
 	tiles = {"farming_hemp_block.png"},
 	paramtype = "light",
@@ -156,7 +179,7 @@ register_node(farming.hemp,"farming:hemp_block", {
 
 -- hemp rope
 
-register_node(false,"farming:hemp_rope", {
+minetest.register_node("farming:hemp_rope", {
 	description = S("Hemp Rope"),
 	walkable = false,
 	climbable = true,
@@ -173,8 +196,7 @@ register_node(false,"farming:hemp_rope", {
 	is_ground_content = false,
 	sounds =  farming.node_sound_leaves_defaults(),
 	selection_box = {
-		type = "fixed",
-		fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}
+		type = "fixed", fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}
 	},
 	_mcl_hardness = 0.8,
 	_mcl_blast_resistance = 1
@@ -182,7 +204,7 @@ register_node(false,"farming:hemp_rope", {
 
 --- Wooden scarecrow base
 
-register_node(false,"farming:scarecrow_bottom", {
+minetest.register_node("farming:scarecrow_bottom", {
 	description = S("Scarecrow Bottom"),
 	paramtype = "light",
 	sunlight_propagates = true,
@@ -208,7 +230,7 @@ if not farming.mcl then
 
 	-- Wooden bowl
 
-	register_craftitem(true,"farming:bowl", {
+	minetest.register_craftitem("farming:bowl", {
 		description = S("Wooden Bowl"),
 		inventory_image = "farming_bowl.png",
 		groups = {food_bowl = 1, flammable = 2}
@@ -216,7 +238,7 @@ if not farming.mcl then
 
 	-- String
 
-	register_craftitem(true,"farming:string", {
+	minetest.register_craftitem("farming:string", {
 		description = S("String"),
 		inventory_image = "farming_string.png",
 		groups = {flammable = 2}
@@ -224,7 +246,7 @@ if not farming.mcl then
 
 	-- Jack 'O Lantern
 
-	register_node(farming.pumpkin,"farming:jackolantern", {
+	minetest.register_node("farming:jackolantern", {
 		description = S("Jack 'O Lantern (punch to turn on and off)"),
 		tiles = {
 			"farming_pumpkin_bottom.png^farming_pumpkin_top.png",
@@ -251,7 +273,7 @@ if not farming.mcl then
 		_mcl_blast_resistance = 1
 	})
 
-	register_node(farming.pumpkin,"farming:jackolantern_on", {
+	minetest.register_node("farming:jackolantern_on", {
 		tiles = {
 			"farming_pumpkin_bottom.png^farming_pumpkin_top.png",
 			"farming_pumpkin_bottom.png",

mods/farming/lucky_block.lua

@@ -105,5 +105,6 @@ lucky_block:add_blocks({
 		{name = "farming:grapebush", max = 5},
 		{name = "farming:asparagus", max = 7}
 	}},
-	{"dro", {"farming:chili_powder"}, 5}
+	{"dro", {"farming:chili_powder"}, 5},
+	{"dro", {"farming:weed"}, 9},
 })

mods/farming/mod.conf

@@ -2,3 +2,6 @@ name = farming
 description = Adds many new plants and food into Minetest.
 optional_depends = default, flowers, mcl_core, mcl_sounds, mcl_farming, mcl_stairs, mcl_flowers, stairs, lucky_block, toolranks
 min_minetest_version = 5.0
+release = 30697
+author = TenPlus1
+title = Farming Redo

mods/farming/settingtypes.txt

@@ -2,3 +2,5 @@
 farming_stage_length (Farming Stage Length) float 160.0
 
 farming_use_utensils (Use utensil recipes) bool true
+
+farming_disable_weeds (Disable Weed growth) bool false

mods/farming/soil.lua

@@ -194,3 +194,30 @@ minetest.register_abm({
 		end
 	end
 })
+
+-- those darn weeds
+
+if minetest.settings:get_bool("farming_disable_weeds") ~= true then
+
+	minetest.register_abm({
+		nodenames = {"group:field"},
+		neighbors = {"air"},
+		interval = 50,
+		chance = 35,
+		catch_up = false,
+
+		action = function(pos, node)
+
+			if minetest.find_node_near(pos, 4, {"farming:scarecrow_bottom"}) then
+				return
+			end
+
+			pos.y = pos.y + 1
+
+			if minetest.get_node(pos).name == "air" then
+				minetest.set_node(pos, {name = "farming:weed", param2 = 2})
+			end
+		end
+	})
+end
+