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

crops/beans.lua

@@ -1,32 +1,27 @@
---[[
-	All textures by
-	(C) Auke Kok <sofar@foo-projects.org>
-	CC-BY-SA-3.0
-]]
 
-local S = farming.translate
+-- All textures by (C) Auke Kok <sofar@foo-projects.org> CC-BY-SA-3.0
+
+local S = minetest.get_translator("farming")
 local a = farming.recipe_items
 
--- place beans
+-- place beans helper
+
 local function place_beans(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
@@ -35,19 +30,15 @@ local function place_beans(itemstack, placer, pointed_thing, plantname)
 	local name = placer and placer:get_player_name() or ""
 
 	-- check for protection
-	if minetest.is_protected(pt.under, name) then
-		return
-	end
+	if minetest.is_protected(pt.under, name) then return end
 
 	-- check if pointing at bean pole
-	if under.name ~= "farming:beanpole" then
-		return
-	end
+	if under.name ~= "farming:beanpole" then return end
 
 	-- add the node and remove 1 item from the itemstack
 	minetest.set_node(pt.under, {name = plantname})
 
-	minetest.sound_play("default_place_node", {pos = pt.under, gain = 1.0})
+	minetest.sound_play("default_place_node", {pos = pt.under, gain = 1.0}, true)
 
 	if placer or not farming.is_creative(placer:get_player_name()) then
 
@@ -57,23 +48,21 @@ local function place_beans(itemstack, placer, pointed_thing, plantname)
 		if itemstack:get_count() == 0 then
 
 			minetest.after(0.20,
-				farming.refill_plant,
-				placer,
-				"farming:beans",
-				placer:get_wield_index()
-			)
+				farming.refill_plant, placer, "farming:beans", placer:get_wield_index())
 		end
 	end
 
 	return itemstack
 end
 
--- beans
+-- item/seed
+
 minetest.register_craftitem("farming:beans", {
 	description = S("Green Beans"),
 	inventory_image = "farming_beans.png",
 	groups = {compostability = 48, seed = 2, food_beans = 1},
 	on_use = minetest.item_eat(1),
+
 	on_place = function(itemstack, placer, pointed_thing)
 		return place_beans(itemstack, placer, pointed_thing, "farming:beanpole_1")
 	end
@@ -81,13 +70,8 @@ minetest.register_craftitem("farming:beans", {
 
 farming.add_eatable("farming:beans", 1)
 
--- beans can be used for green dye
-minetest.register_craft({
-	output = a.dye_green,
-	recipe = {{"farming:beans"}}
-})
-
 -- beanpole
+
 minetest.register_node("farming:beanpole", {
 	description = S("Bean Pole (place on soil before planting beans)"),
 	drawtype = "plantlike",
@@ -109,20 +93,17 @@ minetest.register_node("farming:beanpole", {
 		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 def and def.on_rightclick then
 			return def.on_rightclick(pt.under, under, placer, itemstack, pt)
 		end
@@ -133,9 +114,7 @@ minetest.register_node("farming:beanpole", {
 
 		local nodename = under.name
 
-		if minetest.get_item_group(nodename, "soil") < 2 then
-			return
-		end
+		if minetest.get_item_group(nodename, "soil") < 2 then return end
 
 		local top = {
 			x = pointed_thing.above.x,
@@ -145,9 +124,7 @@ minetest.register_node("farming:beanpole", {
 
 		nodename = minetest.get_node(top).name
 
-		if nodename ~= "air" then
-			return
-		end
+		if nodename ~= "air" then return end
 
 		minetest.set_node(pointed_thing.above, {name = "farming:beanpole"})
 
@@ -159,22 +136,8 @@ minetest.register_node("farming:beanpole", {
 	end
 })
 
-minetest.register_craft({
-	output = "farming:beanpole",
-	recipe = {
-		{"", "", ""},
-		{"group:stick", "", "group:stick"},
-		{"group:stick", "", "group:stick"}
-	}
-})
+-- crop definition
 
-minetest.register_craft({
-	type = "fuel",
-	recipe = "farming:beanpole",
-	burntime = 10
-})
-
--- green bean definition
 local def = {
 	drawtype = "plantlike",
 	tiles = {"farming_beanpole_1.png"},
@@ -199,21 +162,26 @@ local def = {
 }
 
 -- stage 1
+
 minetest.register_node("farming:beanpole_1", table.copy(def))
 
 -- stage2
+
 def.tiles = {"farming_beanpole_2.png"}
 minetest.register_node("farming:beanpole_2", table.copy(def))
 
 -- stage 3
+
 def.tiles = {"farming_beanpole_3.png"}
 minetest.register_node("farming:beanpole_3", table.copy(def))
 
 -- stage 4
+
 def.tiles = {"farming_beanpole_4.png"}
 minetest.register_node("farming:beanpole_4", table.copy(def))
 
 -- stage 5 (final)
+
 def.tiles = {"farming_beanpole_5.png"}
 def.groups.growing = nil
 def.selection_box = farming.select_final
@@ -228,6 +196,7 @@ def.drop = {
 minetest.register_node("farming:beanpole_5", table.copy(def))
 
 -- add to registered_plants
+
 farming.registered_plants["farming:beans"] = {
 	trellis = "farming:beanpole",
 	crop = "farming:beanpole",
@@ -238,6 +207,7 @@ farming.registered_plants["farming:beans"] = {
 }
 
 -- wild green bean bush (this is what you find on the map)
+
 minetest.register_node("farming:beanbush", {
 	drawtype = "plantlike",
 	tiles = {"farming_beanbush.png"},
@@ -263,6 +233,7 @@ minetest.register_node("farming:beanbush", {
 })
 
 -- mapgen
+
 minetest.register_decoration({
 	deco_type = "simple",
 	place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},