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

crops/cotton.lua

@@ -1,38 +1,8 @@
 
-local S = farming.translate
-local a = farming.recipe_items
+local S = minetest.get_translator("farming")
 
--- wild cotton as a source of cotton seed and a chance of cotton itself
-minetest.register_node("farming:cotton_wild", {
-	description = S("Wild Cotton"),
-	drawtype = "plantlike",
-	waving = 1,
-	tiles = {"farming_cotton_wild.png"},
-	inventory_image = "farming_cotton_wild.png",
-	wield_image = "farming_cotton_wild.png",
-	paramtype = "light",
-	sunlight_propagates = true,
-	walkable = false,
-	buildable_to = true,
-	groups = {
-		handy = 1, snappy = 3, attached_node = 1, flammable = 4, compostability = 60
-	},
-	_mcl_hardness = farming.mcl_hardness,
-	is_ground_content = false,
-	drop = {
-		items = {
-			{items = {"farming:cotton"}, rarity = 2},
-			{items = {"farming:seed_cotton"}, rarity = 1}
-		}
-	},
-	sounds = farming.node_sound_leaves_defaults(),
-	selection_box = {
-		type = "fixed",
-		fixed = {-6 / 16, -8 / 16, -6 / 16, 6 / 16, 5 / 16, 6 / 16}
-	}
-})
+-- seed
 
--- cotton seeds
 minetest.register_node("farming:seed_cotton", {
 	description = S("Cotton Seed"),
 	tiles = {"farming_cotton_seed.png"},
@@ -51,63 +21,26 @@ minetest.register_node("farming:seed_cotton", {
 	sunlight_propagates = true,
 	selection_box = farming.select,
 	next_plant = "farming:cotton_1",
+
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:seed_cotton")
 	end,
+
 	on_timer = function(pos, elapsed)
 		minetest.set_node(pos, {name = "farming:cotton_1", param2 = 1})
 	end
 })
 
--- cotton
+-- item
+
 minetest.register_craftitem("farming:cotton", {
 	description = S("Cotton"),
 	inventory_image = "farming_cotton.png",
 	groups = {flammable = 4, compostability = 50}
 })
 
--- string
-if not farming.mcl then
+-- crop definition
 
-	minetest.register_craftitem("farming:string", {
-		description = S("String"),
-		inventory_image = "farming_string.png",
-		groups = {flammable = 2}
-	})
-end
-
--- cotton to wool
-minetest.register_craft({
-	output = a.wool,
-	recipe = {
-		{"farming:cotton", "farming:cotton"},
-		{"farming:cotton", "farming:cotton"}
-	}
-})
-
--- cotton to string
-minetest.register_craft({
-	output = a.string .. " 2",
-	recipe = {
-		{"farming:cotton"},
-		{"farming:cotton"}
-	}
-})
-
--- can be used as fuel
-minetest.register_craft({
-	type = "fuel",
-	recipe = "farming:string",
-	burntime = 1
-})
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "farming:cotton",
-	burntime = 1
-})
-
--- cotton definition
 local def = {
 	drawtype = "plantlike",
 	tiles = {"farming_cotton_1.png"},
@@ -128,21 +61,26 @@ local def = {
 }
 
 -- stage 1
+
 minetest.register_node("farming:cotton_1", table.copy(def))
 
 -- stage 2
+
 def.tiles = {"farming_cotton_2.png"}
 minetest.register_node("farming:cotton_2", table.copy(def))
 
 -- stage 3
+
 def.tiles = {"farming_cotton_3.png"}
 minetest.register_node("farming:cotton_3", table.copy(def))
 
 -- stage 4
+
 def.tiles = {"farming_cotton_4.png"}
 minetest.register_node("farming:cotton_4", table.copy(def))
 
 -- stage 5
+
 def.tiles = {"farming_cotton_5.png"}
 def.drop = {
 	items = {
@@ -152,6 +90,7 @@ def.drop = {
 minetest.register_node("farming:cotton_5", table.copy(def))
 
 -- stage 6
+
 def.tiles = {"farming_cotton_6.png"}
 def.drop = {
 	items = {
@@ -162,6 +101,7 @@ def.drop = {
 minetest.register_node("farming:cotton_6", table.copy(def))
 
 -- stage 7
+
 def.tiles = {"farming_cotton_7.png"}
 def.drop = {
 	items = {
@@ -174,6 +114,7 @@ def.drop = {
 minetest.register_node("farming:cotton_7", table.copy(def))
 
 -- stage 8 (final)
+
 def.tiles = {"farming_cotton_8.png"}
 def.groups.growing = nil
 def.selection_box = farming.select_final
@@ -190,6 +131,7 @@ def.drop = {
 minetest.register_node("farming:cotton_8", table.copy(def))
 
 -- add to registered_plants
+
 farming.registered_plants["farming:cotton"] = {
 	crop = "farming:cotton",
 	seed = "farming:seed_cotton",
@@ -198,15 +140,37 @@ farming.registered_plants["farming:cotton"] = {
 	steps = 8
 }
 
---[[ Cotton using api
-farming.register_plant("farming:cotton", {
-	description = "Cotton seed",
-	inventory_image = "farming_cotton_seed.png",
-	groups = {flammable = 2},
-	steps = 8,
-})]]
+-- wild cotton (this is what you find on the map)
+
+minetest.register_node("farming:cotton_wild", {
+	description = S("Wild Cotton"),
+	drawtype = "plantlike",
+	waving = 1,
+	tiles = {"farming_cotton_wild.png"},
+	inventory_image = "farming_cotton_wild.png",
+	wield_image = "farming_cotton_wild.png",
+	paramtype = "light",
+	sunlight_propagates = true,
+	walkable = false,
+	buildable_to = true,
+	groups = {handy = 1, snappy = 3, attached_node = 1, flammable = 4, compostability = 60},
+	_mcl_hardness = farming.mcl_hardness,
+	is_ground_content = false,
+	drop = {
+		items = {
+			{items = {"farming:cotton"}, rarity = 2},
+			{items = {"farming:seed_cotton"}, rarity = 1}
+		}
+	},
+	sounds = farming.node_sound_leaves_defaults(),
+	selection_box = {
+		type = "fixed",
+		fixed = {-6 / 16, -8 / 16, -6 / 16, 6 / 16, 5 / 16, 6 / 16}
+	}
+})
 
 -- mapgen
+
 local mg = farming.mapgen == "v6"
 
 def = {
@@ -233,3 +197,12 @@ minetest.register_decoration({
 	y_min = 1,
 	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,
+})]]