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

crops/pineapple.lua

@@ -1,18 +1,20 @@
 
-local S = farming.translate
-local a = farming.recipe_items
+local S = minetest.get_translator("farming")
+
+-- seed
 
--- pineapple top
 minetest.register_craftitem("farming:pineapple_top", {
 	description = S("Pineapple Top"),
 	inventory_image = "farming_pineapple_top.png",
 	groups = {compostability = 48, seed = 2, flammable = 2},
+
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:pineapple_1")
 	end
 })
 
--- pineapple
+-- item
+
 minetest.register_node("farming:pineapple", {
 	description = S("Pineapple"),
 	drawtype = "plantlike",
@@ -23,8 +25,7 @@ minetest.register_node("farming:pineapple", {
 	sunlight_propagates = true,
 	walkable = false,
 	selection_box = {
-		type = "fixed",
-		fixed = {-0.27, -0.37, -0.27, 0.27, 0.44, 0.27}
+		type = "fixed", fixed = {-0.27, -0.37, -0.27, 0.27, 0.44, 0.27}
 	},
 	groups = {
 		food_pineapple = 1, fleshy = 3, dig_immediate = 3, flammable = 2,
@@ -34,57 +35,8 @@ minetest.register_node("farming:pineapple", {
 	is_ground_content = false
 })
 
--- pineapple
-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)
-
-minetest.register_craft( {
-	output = "farming:pineapple_ring 5",
-	recipe = {{"group:food_pineapple"}},
-	replacements = {{"farming:pineapple", "farming:pineapple_top"}}
-})
-
--- 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)
-
-minetest.register_craft({
-	output = "farming:pineapple_juice",
-	recipe = {
-		{"group:food_pineapple_ring", "group:food_pineapple_ring",
-				"group:food_pineapple_ring"},
-		{"", a.drinking_glass, ""},
-		{"", a.juicer, ""}
-	},
-	replacements = {
-		{"group:food_juicer", "farming:juicer"}
-	}
-})
-
-minetest.register_craft({
-	output = "farming:pineapple_juice 2",
-	recipe = {
-		{a.drinking_glass, "group:food_pineapple", a.drinking_glass},
-		{"", a.juicer, ""}
-	},
-	replacements = {
-		{"group:food_juicer", "farming:juicer"}
-	}
-})
-
 -- crop definition
+
 local def = {
 	drawtype = "plantlike",
 	visual_scale = 1.5,
@@ -106,33 +58,41 @@ local def = {
 }
 
 -- stage 1
+
 minetest.register_node("farming:pineapple_1", table.copy(def))
 
 -- stage 2
+
 def.tiles = {"farming_pineapple_2.png"}
 minetest.register_node("farming:pineapple_2", table.copy(def))
 
 -- stage 3
+
 def.tiles = {"farming_pineapple_3.png"}
 minetest.register_node("farming:pineapple_3", table.copy(def))
 
 -- stage 4
+
 def.tiles = {"farming_pineapple_4.png"}
 minetest.register_node("farming:pineapple_4", table.copy(def))
 
 -- stage 5
+
 def.tiles = {"farming_pineapple_5.png"}
 minetest.register_node("farming:pineapple_5", table.copy(def))
 
 -- stage 6
+
 def.tiles = {"farming_pineapple_6.png"}
 minetest.register_node("farming:pineapple_6", table.copy(def))
 
 -- stage 7
+
 def.tiles = {"farming_pineapple_7.png"}
 minetest.register_node("farming:pineapple_7", table.copy(def))
 
 -- stage 8 (final)
+
 def.tiles = {"farming_pineapple_8.png"}
 def.groups.growing = nil
 def.selection_box = farming.select_final
@@ -145,6 +105,7 @@ def.drop = {
 minetest.register_node("farming:pineapple_8", table.copy(def))
 
 -- add to registered_plants
+
 farming.registered_plants["farming:pineapple"] = {
 	crop = "farming:pineapple",
 	seed = "farming:pineapple_top",
@@ -154,6 +115,7 @@ farming.registered_plants["farming:pineapple"] = {
 }
 
 -- mapgen
+
 local mg = farming.mapgen == "v6"
 
 def = {