fix code style

fix more code style

fix code style again

fix code style again

fix code again

fix variable name

mods/farming/api.lua

@@ -2,31 +2,26 @@
 -- TODO Ignore group:flower
 
 local creative = minetest.setting_getbool("creative_mode")
-function farming.hoe_on_use(itemstack, user, pt, uses)
+function farming.hoe_on_use(itemstack, user, pt, max_uses)
 	-- check if pointing at a node's top
-	if not pt
+	if not pt or pt.type ~= "node" or pt.above.y ~= pt.under.y+1 then
-	or pt.type ~= "node"
-	or pt.above.y ~= pt.under.y+1 then
 		return
 	end
 
 	local above = minetest.get_node(pt.above)
-	if above.name ~= "air"
+	if above.name ~= "air" or not minetest.registered_nodes[above.name] then
-	or not minetest.registered_nodes[above.name] then
 		return
 	end
 
 	local under = minetest.get_node(pt.under)
-	if not minetest.registered_nodes[under.name]
+	if not minetest.registered_nodes[under.name] or
-	or minetest.get_item_group(under.name, "soil") ~= 1 then
+			minetest.get_item_group(under.name, "soil") ~= 1 then
 		return
 	end
 
 	-- check if (wet) soil defined
 	local soil = minetest.registered_nodes[under.name].soil
-	if not soil
+	if not soil or not soil.wet or not soil.dry then
-	or not soil.wet
-	or not soil.dry then
 		return
 	end
 
@@ -50,7 +45,7 @@ function farming.hoe_on_use(itemstack, user, pt, uses)
 		return
 	end
 
-	itemstack:add_wear(65535/(uses-1))
+	itemstack:add_wear(65535/(max_uses-1))
 	return itemstack
 end
 
@@ -61,21 +56,21 @@ function farming.register_hoe(name, def)
 		name = ":" .. name
 	end
 	-- Check def table
-	if not def.description then
+	assert(def.description, "[farming] missing field description (hoe "..name..")")
-		def.description = "Hoe"
+	assert(def.inventory_image, "[farming] missing field inventory_image (hoe "..name..")")
-	end
+
-	assert(def.inventory_image, "[farming] missing field inventory_image ("..name..")")
+	local uses = tonumber(def.max_uses)
-	if not def.max_uses then
+	assert(uses and uses > 1, "[farming] max uses are invalid (hoe "..name..")")
-		def.max_uses = 30
+
-	end
 	-- Register the tool
 	minetest.register_tool(name, {
 		description = def.description,
 		inventory_image = def.inventory_image,
 		on_use = function(itemstack, user, pointed_thing)
-			return farming.hoe_on_use(itemstack, user, pointed_thing, def.max_uses)
+			return farming.hoe_on_use(itemstack, user, pointed_thing, uses)
 		end
 	})
+
 	-- Register its recipe
 	if not def.material then
 		if def.recipe then
@@ -86,6 +81,7 @@ function farming.register_hoe(name, def)
 		end
 		return
 	end
+
 	minetest.register_craft({
 		output = name:sub(2),
 		recipe = {
@@ -94,6 +90,7 @@ function farming.register_hoe(name, def)
 			{"", "group:stick", ""}
 		}
 	})
+
 	-- Reverse Recipe
 	minetest.register_craft({
 		output = name:sub(2),
@@ -108,9 +105,7 @@ end
 -- Seed placement
 function farming.place_seed(itemstack, placer, pt, plantname)
 	-- check if pointing at a node's top
-	if not pt
+	if not pt or pt.type ~= "node" or pt.above.y ~= pt.under.y+1 then
-	or pt.type ~= "node"
-	or pt.above.y ~= pt.under.y+1 then
 		return
 	end
 
@@ -126,15 +121,15 @@ function farming.place_seed(itemstack, placer, pt, plantname)
 
 	-- check if you can replace the node above the pointed node
 	local above = minetest.get_node(pt.above)
-	if not minetest.registered_nodes[above.name]
+	if not (minetest.registered_nodes[above.name] and
-	or not minetest.registered_nodes[above.name].buildable_to then
+			minetest.registered_nodes[above.name].buildable_to) then
 		return
 	end
 
 	-- check if pointing at soil
 	local under = minetest.get_node(pt.under)
-	if not minetest.registered_nodes[under.name]
+	if not minetest.registered_nodes[under.name] or
-	or minetest.get_item_group(under.name, "soil") < 2 then
+			minetest.get_item_group(under.name, "soil") < 2 then
 		return
 	end
 
@@ -151,15 +146,11 @@ end
 
 -- Register plants
 function farming.register_plant(name, def)
-	if not def.steps then
-		return
-	end
-
 	-- Check def table
-	assert(def.inventory_image, "[farming] missing field inventory_image ("..name..")")
+	assert(def.steps, "[farming] missing field steps (plant "..name..")")
-	if not def.fertility then
+	assert(def.inventory_image, "[farming] missing field inventory_image (plant "..name..")")
-		def.fertility = {}
+	assert(def.description, "[farming] missing field description (plant "..name..")")
-	end
+	def.fertility = def.fertility or {}
 
 	-- Register seed
 	local g = {seed = 1, snappy = 3, attached_node = 1}
@@ -170,7 +161,7 @@ function farming.register_plant(name, def)
 	local mname, pname = unpack(name:split(":"))
 
 	minetest.register_node(":" .. mname .. ":seed_" .. pname, {
-		description = def.description or "Seed",
+		description = def.description,
 		tiles = {def.inventory_image},
 		inventory_image = def.inventory_image,
 		wield_image = def.inventory_image,
@@ -186,7 +177,8 @@ function farming.register_plant(name, def)
 		},
 		fertility = def.fertility,
 		on_place = function(itemstack, placer, pointed_thing)
-			return farming.place_seed(itemstack, placer, pointed_thing, mname .. ":seed_" .. pname)
+			return farming.place_seed(itemstack, placer, pointed_thing,
+					mname .. ":seed_" .. pname)
 		end
 	})
 
@@ -197,8 +189,14 @@ function farming.register_plant(name, def)
 	})
 
 	-- Register growing steps
-	for i=1,def.steps do
+	for i = 1, def.steps do
-		local nodegroups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1}
+		local nodegroups = {
+			snappy = 3,
+			flammable = 2,
+			plant = 1,
+			not_in_creative_inventory = 1,
+			attached_node = 1
+		}
 		nodegroups[pname] = i
 
 		minetest.register_node(mname .. ":" .. pname .. "_" .. i, {
@@ -225,12 +223,8 @@ function farming.register_plant(name, def)
 		})
 	end
 
-	if not def.minlight then
+	def.minlight = def.minlight or 1
-		def.minlight = 1
+	def.maxlight = def.maxlight or 14
-	end
-	if not def.maxlight then
-		def.maxlight = 14
-	end
 
 	-- Growing ABM
 	minetest.register_abm({
@@ -254,20 +248,14 @@ function farming.register_plant(name, def)
 			local fertility = minetest.registered_items[node.name].fertility
 
 			-- grow seed
-			if fertility
+			if fertility and minetest.get_item_group(node.name, "seed") then
-			and minetest.get_item_group(node.name, "seed") then
-				local can_grow
 				for _, v in pairs(fertility) do
 					if minetest.get_item_group(soil_node.name, v) ~= 0 then
-						can_grow = true
+						node.name = node.name:gsub("seed_", "") .. "_1"
-						break
+						minetest.set_node(pos, node)
+						return
 					end
 				end
-				if not can_grow then
-					return
-				end
-				node.name = node.name:gsub("seed_", "") .. "_1"
-				minetest.set_node(pos, node)
 				return
 			end
 
@@ -279,9 +267,7 @@ function farming.register_plant(name, def)
 			-- check light
 			local ll = minetest.get_node_light(pos)
 
-			if not ll
+			if not ll or ll < def.minlight or ll > def.maxlight then
-			or ll < def.minlight
-			or ll > def.maxlight then
 				return
 			end
 

mods/farming/nodes.lua

@@ -20,7 +20,13 @@ minetest.register_node("farming:soil", {
 	description = "Soil",
 	tiles = {"default_dirt.png^farming_soil.png", "default_dirt.png"},
 	drop = "default:dirt",
-	groups = {crumbly=3, not_in_creative_inventory=1, soil=2, grassland = 1, field = 1},
+	groups = {
+		crumbly = 3,
+		not_in_creative_inventory = 1,
+		soil = 2,
+		grassland = 1,
+		field = 1
+	},
 	sounds = default.node_sound_dirt_defaults(),
 	soil = {
 		base = "default:dirt",
@@ -31,9 +37,19 @@ minetest.register_node("farming:soil", {
 
 minetest.register_node("farming:soil_wet", {
 	description = "Wet Soil",
-	tiles = {"default_dirt.png^farming_soil_wet.png", "default_dirt.png^farming_soil_wet_side.png"},
+	tiles = {
+		"default_dirt.png^farming_soil_wet.png",
+		"default_dirt.png^farming_soil_wet_side.png"
+	},
 	drop = "default:dirt",
-	groups = {crumbly=3, not_in_creative_inventory=1, soil=3, wet = 1, grassland = 1, field = 1},
+	groups = {
+		crumbly = 3,
+		not_in_creative_inventory = 1,
+		soil = 3,
+		wet = 1,
+		grassland = 1,
+		field = 1
+	},
 	sounds = default.node_sound_dirt_defaults(),
 	soil = {
 		base = "default:dirt",
@@ -54,7 +70,15 @@ minetest.register_node("farming:desert_sand_soil", {
 	description = "Desert Sand Soil",
 	drop = "default:desert_sand",
 	tiles = {"farming_desert_sand_soil.png", "default_desert_sand.png"},
-	groups = {crumbly=3, not_in_creative_inventory = 1, falling_node=1, sand=1, soil = 2, desert = 1, field = 1},
+	groups = {
+		crumbly = 3,
+		not_in_creative_inventory = 1,
+		falling_node = 1,
+		sand = 1,
+		soil = 2,
+		desert = 1,
+		field = 1
+	},
 	sounds = default.node_sound_sand_defaults(),
 	soil = {
 		base = "default:desert_sand",
@@ -66,8 +90,20 @@ minetest.register_node("farming:desert_sand_soil", {
 minetest.register_node("farming:desert_sand_soil_wet", {
 	description = "Wet Desert Sand Soil",
 	drop = "default:desert_sand",
-	tiles = {"farming_desert_sand_soil_wet.png", "farming_desert_sand_soil_wet_side.png"},
+	tiles = {
-	groups = {crumbly=3, falling_node=1, sand=1, not_in_creative_inventory=1, soil=3, wet = 1, desert = 1, field = 1},
+		"farming_desert_sand_soil_wet.png",
+		"farming_desert_sand_soil_wet_side.png"
+	},
+	groups = {
+		crumbly = 3,
+		falling_node = 1,
+		sand = 1,
+		not_in_creative_inventory = 1,
+		soil = 3,
+		wet = 1,
+		desert = 1,
+		field = 1
+	},
 	sounds = default.node_sound_sand_defaults(),
 	soil = {
 		base = "default:desert_sand",
@@ -91,13 +127,14 @@ minetest.register_abm({
 	action = function(pos, node)
 		local soil = minetest.registered_nodes[node.name].soil
 		if not soil then
-			return
+			error("[farming] field "..node.name.." doesn't have soil")
 		end
 		local wet = soil.wet
 		local base = soil.base
 		local dry = soil.dry
 		if not (wet and base and dry) then
-			return
+			error("[farming] field "..node.name..
+					"'s soil must have wet, base and dry")
 		end
 
 		pos.y = pos.y + 1
@@ -108,9 +145,8 @@ minetest.register_abm({
 		local nn_def = minetest.registered_nodes[nn.name]
 		pos.y = pos.y - 1
 
-		if nn_def
+		if nn_def and nn_def.walkable and
-		and nn_def.walkable
+				minetest.get_item_group(nn.name, "plant") == 0 then
-		and minetest.get_item_group(nn.name, "plant") == 0 then
 			node.name = base
 			minetest.set_node(pos, node)
 			return
@@ -135,8 +171,8 @@ minetest.register_abm({
 		-- turn it back into base if it is already dry
 		if wet_lvl == 0 then
 			-- only turn it back if there is no plant/seed on top of it
-			if minetest.get_item_group(nn.name, "plant") == 0
+			if minetest.get_item_group(nn.name, "plant") == 0 and
-			and minetest.get_item_group(nn.name, "seed") == 0 then
+					minetest.get_item_group(nn.name, "seed") == 0 then
 				node.name = base
 				minetest.set_node(pos, node)
 			end