separate food /non-food items from crop files, tidy code

crops/cocoa.lua

@@ -1,6 +1,5 @@
 
-local S = farming.translate
-local a = farming.recipe_items
+local S = minetest.get_translator("farming")
 
 -- place cocoa
 local function place_cocoa(itemstack, placer, pointed_thing, plantname)
@@ -8,20 +7,17 @@ local function place_cocoa(itemstack, placer, pointed_thing, plantname)
 	local pt = pointed_thing
 
 	-- check if pointing at a node
-	if not pt or pt.type ~= "node" then
-		return
-	end
+	if not pt or pt.type ~= "node" then return end
 
 	local under = minetest.get_node(pt.under)
 
 	-- return if any of the nodes are not registered
-	if not minetest.registered_nodes[under.name] then
-		return
-	end
+	if not minetest.registered_nodes[under.name] then return end
 
 	-- am I right-clicking on something that has a custom on_place set?
 	-- thanks to Krock for helping with this issue :)
 	local def = minetest.registered_nodes[under.name]
+
 	if placer and itemstack and def and def.on_rightclick then
 		return def.on_rightclick(pt.under, under, placer, itemstack, pt)
 	end
@@ -36,14 +32,12 @@ local function place_cocoa(itemstack, placer, pointed_thing, plantname)
 	local name = placer and placer:get_player_name() or ""
 
 	-- check for protection
-	if minetest.is_protected(pt.above, name) then
-		return
-	end
+	if minetest.is_protected(pt.above, name) then return end
 
 	-- add the node and remove 1 item from the itemstack
 	minetest.set_node(pt.above, {name = plantname})
 
-	minetest.sound_play("default_place_node", {pos = pt.above, gain = 1.0})
+	minetest.sound_play("default_place_node", {pos = pt.above, gain = 1.0}, true)
 
 	if placer and not farming.is_creative(placer:get_player_name()) then
 
@@ -52,102 +46,28 @@ local function place_cocoa(itemstack, placer, pointed_thing, plantname)
 		-- check for refill
 		if itemstack:get_count() == 0 then
 
-			minetest.after(0.20,
-				farming.refill_plant,
-				placer,
-				"farming:cocoa_beans_raw",
-				placer:get_wield_index()
-			)
+			minetest.after(0.20, farming.refill_plant, placer,
+					"farming:cocoa_beans_raw", placer:get_wield_index())
 		end
 	end
 
 	return itemstack
 end
 
--- cocoa beans
+-- item/seed
+
 minetest.register_craftitem("farming:cocoa_beans_raw", {
 	description = S("Raw Cocoa Beans"),
 	inventory_image = "farming_cocoa_beans.png^[brighten",
 	groups = {compostability = 48, seed = 1, flammable = 2},
+
 	on_place = function(itemstack, placer, pointed_thing)
 		return place_cocoa(itemstack, placer, pointed_thing, "farming:cocoa_1")
 	end
 })
 
-minetest.register_craftitem("farming:cocoa_beans", {
-	description = S("Cocoa Beans"),
-	inventory_image = "farming_cocoa_beans.png",
-	groups = {compostability = 65, food_cocoa = 1, flammable = 2}
-})
+-- crop definition
 
-minetest.register_craft({
-	type = "cooking",
-	cooktime = 5,
-	output = "farming:cocoa_beans",
-	recipe = "farming:cocoa_beans_raw"
-})
-
-minetest.register_craft( {
-	output = a.dye_brown,
-	recipe = {{"farming:cocoa_beans"}}
-})
-
--- chocolate 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)
-
-minetest.register_craft( {
-	output = "farming:cookie 8",
-	recipe = {
-		{"group:food_wheat", "group:food_cocoa", "group:food_wheat" }
-	}
-})
-
--- bar of dark chocolate (thanks to Ice Pandora for her deviantart.com chocolate tutorial)
-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)
-
-minetest.register_craft( {
-	output = "farming:chocolate_dark",
-	recipe = {
-		{"group:food_cocoa", "group:food_cocoa", "group:food_cocoa"}
-	}
-})
-
--- chocolate block
-minetest.register_node("farming:chocolate_block", {
-	description = S("Chocolate Block"),
-	tiles = {"farming_chocolate_block.png"},
-	is_ground_content = false,
-	groups = {cracky = 2, oddly_breakable_by_hand = 2},
-	sounds = farming.node_sound_stone_defaults()
-})
-
-minetest.register_craft({
-	output = "farming:chocolate_block",
-	recipe = {
-		{"farming:chocolate_dark", "farming:chocolate_dark", "farming:chocolate_dark"},
-		{"farming:chocolate_dark", "farming:chocolate_dark", "farming:chocolate_dark"},
-		{"farming:chocolate_dark", "farming:chocolate_dark", "farming:chocolate_dark"}
-	}
-})
-
-minetest.register_craft({
-	output = "farming:chocolate_dark 9",
-	recipe = {{"farming:chocolate_block"}}
-})
-
--- cocoa definition
 local def = {
 	drawtype = "plantlike",
 	tiles = {"farming_cocoa_1.png"},
@@ -166,7 +86,7 @@ local def = {
 	is_ground_content = false,
 	sounds = farming.node_sound_leaves_defaults(),
 
-	-- custom function to check for growing conditions, returning True when found
+	-- custom function that returns True when conditions are met
 	growth_check = function(pos, node_name)
 
 		if minetest.find_node_near(pos, 1,
@@ -179,13 +99,16 @@ local def = {
 }
 
 -- stage 1
+
 minetest.register_node("farming:cocoa_1", table.copy(def))
 
 -- stage 2
+
 def.tiles = {"farming_cocoa_2.png"}
 minetest.register_node("farming:cocoa_2", table.copy(def))
 
 -- stage3
+
 def.tiles = {"farming_cocoa_3.png"}
 def.drop = {
 	items = {
@@ -195,6 +118,7 @@ def.drop = {
 minetest.register_node("farming:cocoa_3", table.copy(def))
 
 -- stage 4 (final)
+
 def.tiles = {"farming_cocoa_4.png"}
 def.groups.growing = nil
 def.growth_check = nil
@@ -208,6 +132,7 @@ def.drop = {
 minetest.register_node("farming:cocoa_4", table.copy(def))
 
 -- add to registered_plants
+
 farming.registered_plants["farming:cocoa_beans"] = {
 	trellis = "default:jungletree",
 	crop = "farming:cocoa",
@@ -218,6 +143,7 @@ farming.registered_plants["farming:cocoa_beans"] = {
 }
 
 -- register async mapgen script
+
 if minetest.register_mapgen_script then
 	minetest.register_mapgen_script(farming.path .. "/crops/cocoa_mapgen.lua")
 else