From 25c8c8aeb0728950921f9eda6e1cbdf27908838b Mon Sep 17 00:00:00 2001
From: Craig Robbins <kde.psych@gmail.com>
Date: Wed, 20 Aug 2014 16:41:43 +1000
Subject: [PATCH 01/10] Early exit from abstract_ferns.grow_giant_tree_fern

(very) small performance increase
---
 ferns/gianttreefern.lua | 172 ++++++++++++++++++++--------------------
 1 file changed, 86 insertions(+), 86 deletions(-)

diff --git a/ferns/gianttreefern.lua b/ferns/gianttreefern.lua
index 689bcac..4898d8e 100644
--- a/ferns/gianttreefern.lua
+++ b/ferns/gianttreefern.lua
@@ -11,8 +11,14 @@
 -- lot of code, lot to load
 
 abstract_ferns.grow_giant_tree_fern = function(pos)
-	local size = math.random(12,16)	-- min of range must be >= 4
 	local pos_01 = {x = pos.x, y = pos.y + 1, z = pos.z}
+	if minetest.get_node(pos_01).name ~= "air"
+			and minetest.get_node(pos_01).name ~= "ferns:sapling_giant_tree_fern"
+			and minetest.get_node(pos_01).name ~= "default:junglegrass" then
+		return
+	end
+
+	local size = math.random(12,16)	-- min of range must be >= 4
 	
 	local leave_a_1 = {x = pos.x + 1, y = pos.y + size - 1, z = pos.z    }
 	local leave_a_2 = {x = pos.x + 2, y = pos.y + size    , z = pos.z    }
@@ -33,93 +39,87 @@ abstract_ferns.grow_giant_tree_fern = function(pos)
 	local leave_d_2 = {x = pos.x    , y = pos.y + size    , z = pos.z - 2}
 	local leave_d_3 = {x = pos.x    , y = pos.y + size - 1, z = pos.z - 3}
 	local leave_d_4 = {x = pos.x    , y = pos.y + size - 2, z = pos.z - 4}
-	
-	if minetest.get_node(pos_01).name == "air"  -- instead of check_air = true,
-	or minetest.get_node(pos_01).name == "ferns:sapling_giant_tree_fern"
-	or minetest.get_node(pos_01).name == "default:junglegrass" then
-		
-		for i = 1, size-3 do
-			minetest.set_node({x = pos.x, y = pos.y + i, z = pos.z}, {name="ferns:fern_trunk_big"})
-		end
-		minetest.set_node({x = pos.x, y = pos.y + size-2, z = pos.z}, {name="ferns:fern_trunk_big_top"})
-		minetest.set_node({x = pos.x, y = pos.y + size-1, z = pos.z}, {name="ferns:tree_fern_leaves_giant"})
-
-		-- all the checking for air below is to prevent some ugly bugs (incomplete trunks of neighbouring trees), it's a bit slower, but worth the result
-		
-		if minetest.get_node(leave_a_1).name == "air" then	
-			minetest.set_node(leave_a_1, {name="ferns:tree_fern_leave_big"})
-			if minetest.get_node(leave_a_2).name == "air" then
-				minetest.set_node(leave_a_2, {name="ferns:tree_fern_leave_big"})
-				if minetest.get_node(leave_a_3).name == "air" then
-					minetest.set_node(leave_a_3, {name="ferns:tree_fern_leave_big"})
-					if minetest.get_node(leave_a_4).name == "air" then
-						minetest.set_node(leave_a_4, {name="ferns:tree_fern_leave_big_end", param2=3})
-					end
-				end
-			end
-		end
-		
-		if minetest.get_node(leave_b_1).name == "air" then
-			minetest.set_node(leave_b_1, {name="ferns:tree_fern_leave_big"})
-			if minetest.get_node(leave_b_2).name == "air" then
-				minetest.set_node(leave_b_2, {name="ferns:tree_fern_leave_big"})
-				if minetest.get_node(leave_b_3).name == "air" then
-					minetest.set_node(leave_b_3, {name="ferns:tree_fern_leave_big"})
-					if minetest.get_node(leave_b_4).name == "air" then
-						minetest.set_node(leave_b_4, {name="ferns:tree_fern_leave_big_end", param2=1})
-					end
-				end
-			end
-		end
-		
-		if minetest.get_node(leave_c_1).name == "air" then
-			minetest.set_node(leave_c_1, {name="ferns:tree_fern_leave_big"})
-			if minetest.get_node(leave_c_2).name == "air" then
-				minetest.set_node(leave_c_2, {name="ferns:tree_fern_leave_big"})
-				if minetest.get_node(leave_c_3).name == "air" then
-					minetest.set_node(leave_c_3, {name="ferns:tree_fern_leave_big"})
-					if minetest.get_node(leave_c_4).name == "air" then
-						minetest.set_node(leave_c_4, {name="ferns:tree_fern_leave_big_end", param2=2})
-					end
-				end
-			end
-		end
-			
-		if minetest.get_node(leave_d_1).name == "air" then
-			minetest.set_node(leave_d_1, {name="ferns:tree_fern_leave_big"})
-			if minetest.get_node(leave_d_2).name == "air" then
-				minetest.set_node(leave_d_2, {name="ferns:tree_fern_leave_big"})
-				if minetest.get_node(leave_d_3).name == "air" then
-					minetest.set_node(leave_d_3, {name="ferns:tree_fern_leave_big"})
-					if minetest.get_node(leave_d_4).name == "air" then
-						minetest.set_node(leave_d_4, {name="ferns:tree_fern_leave_big_end", param2=0})
-					end
-				end
-			end
-		end
-
-		-- bug fixes # 2 - doesn't really work, so disabled for now
-		--[[if minetest.get_node(leave_a_4).name == "ferns:tree_fern_leave_big_end"
-		and minetest.get_node(leave_a_3).name == "ferns:fern_trunk_big" then
-			minetest.set_node(leave_a_4, {name="air"})
-		end
-		
-		if minetest.get_node(leave_b_4).name == "ferns:tree_fern_leave_big_end"
-		and minetest.get_node(leave_b_3).name == "ferns:fern_trunk_big" then
-			minetest.set_node(leave_b_4, {name="air"})
-		end
-		
-		if minetest.get_node(leave_c_4).name == "ferns:tree_fern_leave_big_end"
-		and minetest.get_node(leave_c_3).name == "ferns:fern_trunk_big" then
-			minetest.set_node(leave_c_4, {name="air"})
-		end
-		
-		if minetest.get_node(leave_d_4).name == "ferns:tree_fern_leave_big_end"
-		and minetest.get_node(leave_d_3).name == "ferns:fern_trunk_big" then
-			minetest.set_node(leave_d_4, {name="air"})
-		end]]
 		
+	for i = 1, size-3 do
+		minetest.set_node({x = pos.x, y = pos.y + i, z = pos.z}, {name="ferns:fern_trunk_big"})
 	end
+	minetest.set_node({x = pos.x, y = pos.y + size-2, z = pos.z}, {name="ferns:fern_trunk_big_top"})
+	minetest.set_node({x = pos.x, y = pos.y + size-1, z = pos.z}, {name="ferns:tree_fern_leaves_giant"})
+
+	-- all the checking for air below is to prevent some ugly bugs (incomplete trunks of neighbouring trees), it's a bit slower, but worth the result
+
+	if minetest.get_node(leave_a_1).name == "air" then
+		minetest.set_node(leave_a_1, {name="ferns:tree_fern_leave_big"})
+		if minetest.get_node(leave_a_2).name == "air" then
+			minetest.set_node(leave_a_2, {name="ferns:tree_fern_leave_big"})
+			if minetest.get_node(leave_a_3).name == "air" then
+				minetest.set_node(leave_a_3, {name="ferns:tree_fern_leave_big"})
+				if minetest.get_node(leave_a_4).name == "air" then
+					minetest.set_node(leave_a_4, {name="ferns:tree_fern_leave_big_end", param2=3})
+				end
+			end
+		end
+	end
+
+	if minetest.get_node(leave_b_1).name == "air" then
+		minetest.set_node(leave_b_1, {name="ferns:tree_fern_leave_big"})
+		if minetest.get_node(leave_b_2).name == "air" then
+			minetest.set_node(leave_b_2, {name="ferns:tree_fern_leave_big"})
+			if minetest.get_node(leave_b_3).name == "air" then
+				minetest.set_node(leave_b_3, {name="ferns:tree_fern_leave_big"})
+				if minetest.get_node(leave_b_4).name == "air" then
+					minetest.set_node(leave_b_4, {name="ferns:tree_fern_leave_big_end", param2=1})
+				end
+			end
+		end
+	end
+
+	if minetest.get_node(leave_c_1).name == "air" then
+		minetest.set_node(leave_c_1, {name="ferns:tree_fern_leave_big"})
+		if minetest.get_node(leave_c_2).name == "air" then
+			minetest.set_node(leave_c_2, {name="ferns:tree_fern_leave_big"})
+			if minetest.get_node(leave_c_3).name == "air" then
+				minetest.set_node(leave_c_3, {name="ferns:tree_fern_leave_big"})
+				if minetest.get_node(leave_c_4).name == "air" then
+					minetest.set_node(leave_c_4, {name="ferns:tree_fern_leave_big_end", param2=2})
+				end
+			end
+		end
+	end
+
+	if minetest.get_node(leave_d_1).name == "air" then
+		minetest.set_node(leave_d_1, {name="ferns:tree_fern_leave_big"})
+		if minetest.get_node(leave_d_2).name == "air" then
+			minetest.set_node(leave_d_2, {name="ferns:tree_fern_leave_big"})
+			if minetest.get_node(leave_d_3).name == "air" then
+				minetest.set_node(leave_d_3, {name="ferns:tree_fern_leave_big"})
+				if minetest.get_node(leave_d_4).name == "air" then
+					minetest.set_node(leave_d_4, {name="ferns:tree_fern_leave_big_end", param2=0})
+				end
+			end
+		end
+	end
+
+	-- bug fixes # 2 - doesn't really work, so disabled for now
+	--[[if minetest.get_node(leave_a_4).name == "ferns:tree_fern_leave_big_end"
+	and minetest.get_node(leave_a_3).name == "ferns:fern_trunk_big" then
+		minetest.set_node(leave_a_4, {name="air"})
+	end
+
+	if minetest.get_node(leave_b_4).name == "ferns:tree_fern_leave_big_end"
+	and minetest.get_node(leave_b_3).name == "ferns:fern_trunk_big" then
+		minetest.set_node(leave_b_4, {name="air"})
+	end
+
+	if minetest.get_node(leave_c_4).name == "ferns:tree_fern_leave_big_end"
+	and minetest.get_node(leave_c_3).name == "ferns:fern_trunk_big" then
+		minetest.set_node(leave_c_4, {name="air"})
+	end
+
+	if minetest.get_node(leave_d_4).name == "ferns:tree_fern_leave_big_end"
+	and minetest.get_node(leave_d_3).name == "ferns:fern_trunk_big" then
+		minetest.set_node(leave_d_4, {name="air"})
+	end]]
 end
 
 -----------------------------------------------------------------------------------------------

From 786a28a5e96c6460a91515a917babebebf27c965 Mon Sep 17 00:00:00 2001
From: Craig Robbins <kde.psych@gmail.com>
Date: Wed, 20 Aug 2014 16:57:01 +1000
Subject: [PATCH 02/10] Renamed "leave" to "leaf" where appropriate

---
 ferns/gianttreefern.lua | 130 ++++++++++++++++++++--------------------
 1 file changed, 65 insertions(+), 65 deletions(-)

diff --git a/ferns/gianttreefern.lua b/ferns/gianttreefern.lua
index 4898d8e..dc112aa 100644
--- a/ferns/gianttreefern.lua
+++ b/ferns/gianttreefern.lua
@@ -20,112 +20,112 @@ abstract_ferns.grow_giant_tree_fern = function(pos)
 
 	local size = math.random(12,16)	-- min of range must be >= 4
 	
-	local leave_a_1 = {x = pos.x + 1, y = pos.y + size - 1, z = pos.z    }
-	local leave_a_2 = {x = pos.x + 2, y = pos.y + size    , z = pos.z    }
-	local leave_a_3 = {x = pos.x + 3, y = pos.y + size - 1, z = pos.z    }
-	local leave_a_4 = {x = pos.x + 4, y = pos.y + size - 2, z = pos.z    }
+	local leaf_a_1 = {x = pos.x + 1, y = pos.y + size - 1, z = pos.z    }
+	local leaf_a_2 = {x = pos.x + 2, y = pos.y + size    , z = pos.z    }
+	local leaf_a_3 = {x = pos.x + 3, y = pos.y + size - 1, z = pos.z    }
+	local leaf_a_4 = {x = pos.x + 4, y = pos.y + size - 2, z = pos.z    }
 	
-	local leave_b_1 = {x = pos.x - 1, y = pos.y + size - 1, z = pos.z    }
-	local leave_b_2 = {x = pos.x - 2, y = pos.y + size,     z = pos.z    }
-	local leave_b_3 = {x = pos.x - 3, y = pos.y + size - 1, z = pos.z    }
-	local leave_b_4 = {x = pos.x - 4, y = pos.y + size - 2, z = pos.z    }
+	local leaf_b_1 = {x = pos.x - 1, y = pos.y + size - 1, z = pos.z    }
+	local leaf_b_2 = {x = pos.x - 2, y = pos.y + size,     z = pos.z    }
+	local leaf_b_3 = {x = pos.x - 3, y = pos.y + size - 1, z = pos.z    }
+	local leaf_b_4 = {x = pos.x - 4, y = pos.y + size - 2, z = pos.z    }
 	
-	local leave_c_1 = {x = pos.x    , y = pos.y + size - 1, z = pos.z + 1}
-	local leave_c_2 = {x = pos.x    , y = pos.y + size    , z = pos.z + 2}
-	local leave_c_3 = {x = pos.x    , y = pos.y + size - 1, z = pos.z + 3}
-	local leave_c_4 = {x = pos.x    , y = pos.y + size - 2, z = pos.z + 4}
+	local leaf_c_1 = {x = pos.x    , y = pos.y + size - 1, z = pos.z + 1}
+	local leaf_c_2 = {x = pos.x    , y = pos.y + size    , z = pos.z + 2}
+	local leaf_c_3 = {x = pos.x    , y = pos.y + size - 1, z = pos.z + 3}
+	local leaf_c_4 = {x = pos.x    , y = pos.y + size - 2, z = pos.z + 4}
 	
-	local leave_d_1 = {x = pos.x    , y = pos.y + size - 1, z = pos.z - 1}
-	local leave_d_2 = {x = pos.x    , y = pos.y + size    , z = pos.z - 2}
-	local leave_d_3 = {x = pos.x    , y = pos.y + size - 1, z = pos.z - 3}
-	local leave_d_4 = {x = pos.x    , y = pos.y + size - 2, z = pos.z - 4}
+	local leaf_d_1 = {x = pos.x    , y = pos.y + size - 1, z = pos.z - 1}
+	local leaf_d_2 = {x = pos.x    , y = pos.y + size    , z = pos.z - 2}
+	local leaf_d_3 = {x = pos.x    , y = pos.y + size - 1, z = pos.z - 3}
+	local leaf_d_4 = {x = pos.x    , y = pos.y + size - 2, z = pos.z - 4}
 		
 	for i = 1, size-3 do
 		minetest.set_node({x = pos.x, y = pos.y + i, z = pos.z}, {name="ferns:fern_trunk_big"})
 	end
 	minetest.set_node({x = pos.x, y = pos.y + size-2, z = pos.z}, {name="ferns:fern_trunk_big_top"})
-	minetest.set_node({x = pos.x, y = pos.y + size-1, z = pos.z}, {name="ferns:tree_fern_leaves_giant"})
+	minetest.set_node({x = pos.x, y = pos.y + size-1, z = pos.z}, {name="ferns:tree_fern_leafs_giant"})
 
 	-- all the checking for air below is to prevent some ugly bugs (incomplete trunks of neighbouring trees), it's a bit slower, but worth the result
 
-	if minetest.get_node(leave_a_1).name == "air" then
-		minetest.set_node(leave_a_1, {name="ferns:tree_fern_leave_big"})
-		if minetest.get_node(leave_a_2).name == "air" then
-			minetest.set_node(leave_a_2, {name="ferns:tree_fern_leave_big"})
-			if minetest.get_node(leave_a_3).name == "air" then
-				minetest.set_node(leave_a_3, {name="ferns:tree_fern_leave_big"})
-				if minetest.get_node(leave_a_4).name == "air" then
-					minetest.set_node(leave_a_4, {name="ferns:tree_fern_leave_big_end", param2=3})
+	if minetest.get_node(leaf_a_1).name == "air" then
+		minetest.set_node(leaf_a_1, {name="ferns:tree_fern_leaf_big"})
+		if minetest.get_node(leaf_a_2).name == "air" then
+			minetest.set_node(leaf_a_2, {name="ferns:tree_fern_leaf_big"})
+			if minetest.get_node(leaf_a_3).name == "air" then
+				minetest.set_node(leaf_a_3, {name="ferns:tree_fern_leaf_big"})
+				if minetest.get_node(leaf_a_4).name == "air" then
+					minetest.set_node(leaf_a_4, {name="ferns:tree_fern_leaf_big_end", param2=3})
 				end
 			end
 		end
 	end
 
-	if minetest.get_node(leave_b_1).name == "air" then
-		minetest.set_node(leave_b_1, {name="ferns:tree_fern_leave_big"})
-		if minetest.get_node(leave_b_2).name == "air" then
-			minetest.set_node(leave_b_2, {name="ferns:tree_fern_leave_big"})
-			if minetest.get_node(leave_b_3).name == "air" then
-				minetest.set_node(leave_b_3, {name="ferns:tree_fern_leave_big"})
-				if minetest.get_node(leave_b_4).name == "air" then
-					minetest.set_node(leave_b_4, {name="ferns:tree_fern_leave_big_end", param2=1})
+	if minetest.get_node(leaf_b_1).name == "air" then
+		minetest.set_node(leaf_b_1, {name="ferns:tree_fern_leaf_big"})
+		if minetest.get_node(leaf_b_2).name == "air" then
+			minetest.set_node(leaf_b_2, {name="ferns:tree_fern_leaf_big"})
+			if minetest.get_node(leaf_b_3).name == "air" then
+				minetest.set_node(leaf_b_3, {name="ferns:tree_fern_leaf_big"})
+				if minetest.get_node(leaf_b_4).name == "air" then
+					minetest.set_node(leaf_b_4, {name="ferns:tree_fern_leaf_big_end", param2=1})
 				end
 			end
 		end
 	end
 
-	if minetest.get_node(leave_c_1).name == "air" then
-		minetest.set_node(leave_c_1, {name="ferns:tree_fern_leave_big"})
-		if minetest.get_node(leave_c_2).name == "air" then
-			minetest.set_node(leave_c_2, {name="ferns:tree_fern_leave_big"})
-			if minetest.get_node(leave_c_3).name == "air" then
-				minetest.set_node(leave_c_3, {name="ferns:tree_fern_leave_big"})
-				if minetest.get_node(leave_c_4).name == "air" then
-					minetest.set_node(leave_c_4, {name="ferns:tree_fern_leave_big_end", param2=2})
+	if minetest.get_node(leaf_c_1).name == "air" then
+		minetest.set_node(leaf_c_1, {name="ferns:tree_fern_leaf_big"})
+		if minetest.get_node(leaf_c_2).name == "air" then
+			minetest.set_node(leaf_c_2, {name="ferns:tree_fern_leaf_big"})
+			if minetest.get_node(leaf_c_3).name == "air" then
+				minetest.set_node(leaf_c_3, {name="ferns:tree_fern_leaf_big"})
+				if minetest.get_node(leaf_c_4).name == "air" then
+					minetest.set_node(leaf_c_4, {name="ferns:tree_fern_leaf_big_end", param2=2})
 				end
 			end
 		end
 	end
 
-	if minetest.get_node(leave_d_1).name == "air" then
-		minetest.set_node(leave_d_1, {name="ferns:tree_fern_leave_big"})
-		if minetest.get_node(leave_d_2).name == "air" then
-			minetest.set_node(leave_d_2, {name="ferns:tree_fern_leave_big"})
-			if minetest.get_node(leave_d_3).name == "air" then
-				minetest.set_node(leave_d_3, {name="ferns:tree_fern_leave_big"})
-				if minetest.get_node(leave_d_4).name == "air" then
-					minetest.set_node(leave_d_4, {name="ferns:tree_fern_leave_big_end", param2=0})
+	if minetest.get_node(leaf_d_1).name == "air" then
+		minetest.set_node(leaf_d_1, {name="ferns:tree_fern_leaf_big"})
+		if minetest.get_node(leaf_d_2).name == "air" then
+			minetest.set_node(leaf_d_2, {name="ferns:tree_fern_leaf_big"})
+			if minetest.get_node(leaf_d_3).name == "air" then
+				minetest.set_node(leaf_d_3, {name="ferns:tree_fern_leaf_big"})
+				if minetest.get_node(leaf_d_4).name == "air" then
+					minetest.set_node(leaf_d_4, {name="ferns:tree_fern_leaf_big_end", param2=0})
 				end
 			end
 		end
 	end
 
 	-- bug fixes # 2 - doesn't really work, so disabled for now
-	--[[if minetest.get_node(leave_a_4).name == "ferns:tree_fern_leave_big_end"
-	and minetest.get_node(leave_a_3).name == "ferns:fern_trunk_big" then
-		minetest.set_node(leave_a_4, {name="air"})
+	--[[if minetest.get_node(leaf_a_4).name == "ferns:tree_fern_leaf_big_end"
+	and minetest.get_node(leaf_a_3).name == "ferns:fern_trunk_big" then
+		minetest.set_node(leaf_a_4, {name="air"})
 	end
 
-	if minetest.get_node(leave_b_4).name == "ferns:tree_fern_leave_big_end"
-	and minetest.get_node(leave_b_3).name == "ferns:fern_trunk_big" then
-		minetest.set_node(leave_b_4, {name="air"})
+	if minetest.get_node(leaf_b_4).name == "ferns:tree_fern_leaf_big_end"
+	and minetest.get_node(leaf_b_3).name == "ferns:fern_trunk_big" then
+		minetest.set_node(leaf_b_4, {name="air"})
 	end
 
-	if minetest.get_node(leave_c_4).name == "ferns:tree_fern_leave_big_end"
-	and minetest.get_node(leave_c_3).name == "ferns:fern_trunk_big" then
-		minetest.set_node(leave_c_4, {name="air"})
+	if minetest.get_node(leaf_c_4).name == "ferns:tree_fern_leaf_big_end"
+	and minetest.get_node(leaf_c_3).name == "ferns:fern_trunk_big" then
+		minetest.set_node(leaf_c_4, {name="air"})
 	end
 
-	if minetest.get_node(leave_d_4).name == "ferns:tree_fern_leave_big_end"
-	and minetest.get_node(leave_d_3).name == "ferns:fern_trunk_big" then
-		minetest.set_node(leave_d_4, {name="air"})
+	if minetest.get_node(leaf_d_4).name == "ferns:tree_fern_leaf_big_end"
+	and minetest.get_node(leaf_d_3).name == "ferns:fern_trunk_big" then
+		minetest.set_node(leaf_d_4, {name="air"})
 	end]]
 end
 
 -----------------------------------------------------------------------------------------------
 -- GIANT TREE FERN LEAVES
 -----------------------------------------------------------------------------------------------
-minetest.register_node("ferns:tree_fern_leaves_giant", {
+minetest.register_node("ferns:tree_fern_leafs_giant", {
 	description = "Tree Fern Crown (Dicksonia)",
 	drawtype = "plantlike",
 	visual_scale = math.sqrt(8),
@@ -150,7 +150,7 @@ minetest.register_node("ferns:tree_fern_leaves_giant", {
 				rarity = 40,
 			},
 			{
-				items = {"ferns:tree_fern_leaves_giant"},
+				items = {"ferns:tree_fern_leafs_giant"},
 			}
 		}
 	},
@@ -163,7 +163,7 @@ minetest.register_node("ferns:tree_fern_leaves_giant", {
 -----------------------------------------------------------------------------------------------
 -- GIANT TREE FERN LEAVE PART
 -----------------------------------------------------------------------------------------------
-minetest.register_node("ferns:tree_fern_leave_big", {
+minetest.register_node("ferns:tree_fern_leaf_big", {
 	description = "Giant Tree Fern Leaves",
 	drawtype = "raillike",
 	paramtype = "light",
@@ -184,7 +184,7 @@ minetest.register_node("ferns:tree_fern_leave_big", {
 -----------------------------------------------------------------------------------------------
 -- GIANT TREE FERN LEAVE END
 -----------------------------------------------------------------------------------------------
-minetest.register_node("ferns:tree_fern_leave_big_end", {
+minetest.register_node("ferns:tree_fern_leaf_big_end", {
 	description = "Giant Tree Fern Leave End",
 	drawtype = "nodebox",
 	paramtype = "light",

From fc3363d4393945e4d363034165c6d749617c17ca Mon Sep 17 00:00:00 2001
From: Craig Robbins <kde.psych@gmail.com>
Date: Wed, 20 Aug 2014 18:00:59 +1000
Subject: [PATCH 03/10] Refactor abstract_ferns.grow_giant_tree_fern

Arguably more readable; definately more maintainable

Potentially slower but if it is the difference would be negligable
---
 ferns/gianttreefern.lua | 143 ++++++++++++++++------------------------
 1 file changed, 55 insertions(+), 88 deletions(-)

diff --git a/ferns/gianttreefern.lua b/ferns/gianttreefern.lua
index dc112aa..624523e 100644
--- a/ferns/gianttreefern.lua
+++ b/ferns/gianttreefern.lua
@@ -20,26 +20,45 @@ abstract_ferns.grow_giant_tree_fern = function(pos)
 
 	local size = math.random(12,16)	-- min of range must be >= 4
 	
-	local leaf_a_1 = {x = pos.x + 1, y = pos.y + size - 1, z = pos.z    }
-	local leaf_a_2 = {x = pos.x + 2, y = pos.y + size    , z = pos.z    }
-	local leaf_a_3 = {x = pos.x + 3, y = pos.y + size - 1, z = pos.z    }
-	local leaf_a_4 = {x = pos.x + 4, y = pos.y + size - 2, z = pos.z    }
-	
-	local leaf_b_1 = {x = pos.x - 1, y = pos.y + size - 1, z = pos.z    }
-	local leaf_b_2 = {x = pos.x - 2, y = pos.y + size,     z = pos.z    }
-	local leaf_b_3 = {x = pos.x - 3, y = pos.y + size - 1, z = pos.z    }
-	local leaf_b_4 = {x = pos.x - 4, y = pos.y + size - 2, z = pos.z    }
-	
-	local leaf_c_1 = {x = pos.x    , y = pos.y + size - 1, z = pos.z + 1}
-	local leaf_c_2 = {x = pos.x    , y = pos.y + size    , z = pos.z + 2}
-	local leaf_c_3 = {x = pos.x    , y = pos.y + size - 1, z = pos.z + 3}
-	local leaf_c_4 = {x = pos.x    , y = pos.y + size - 2, z = pos.z + 4}
-	
-	local leaf_d_1 = {x = pos.x    , y = pos.y + size - 1, z = pos.z - 1}
-	local leaf_d_2 = {x = pos.x    , y = pos.y + size    , z = pos.z - 2}
-	local leaf_d_3 = {x = pos.x    , y = pos.y + size - 1, z = pos.z - 3}
-	local leaf_d_4 = {x = pos.x    , y = pos.y + size - 2, z = pos.z - 4}
-		
+	local leafchecks = {
+		{
+			direction  = 3,
+			positions = {
+				{x = pos.x + 1, y = pos.y + size - 1, z = pos.z    },
+				{x = pos.x + 2, y = pos.y + size    , z = pos.z    },
+				{x = pos.x + 3, y = pos.y + size - 1, z = pos.z    },
+				{x = pos.x + 4, y = pos.y + size - 2, z = pos.z    }
+			}
+		},
+		{
+			direction  = 1,
+			positions = {
+				{x = pos.x - 1, y = pos.y + size - 1, z = pos.z    },
+				{x = pos.x - 2, y = pos.y + size,     z = pos.z    },
+				{x = pos.x - 3, y = pos.y + size - 1, z = pos.z    },
+				{x = pos.x - 4, y = pos.y + size - 2, z = pos.z    }
+			}
+		},
+		{
+			direction  = 2,
+			positions = {
+				{x = pos.x    , y = pos.y + size - 1, z = pos.z + 1},
+				{x = pos.x    , y = pos.y + size    , z = pos.z + 2},
+				{x = pos.x    , y = pos.y + size - 1, z = pos.z + 3},
+				{x = pos.x    , y = pos.y + size - 2, z = pos.z + 4}
+			}
+		},
+		{
+			direction  = 0,
+			positions = {
+				{x = pos.x    , y = pos.y + size - 1, z = pos.z - 1},
+				{x = pos.x    , y = pos.y + size    , z = pos.z - 2},
+				{x = pos.x    , y = pos.y + size - 1, z = pos.z - 3},
+				{x = pos.x    , y = pos.y + size - 2, z = pos.z - 4}
+			}
+		}
+	}
+
 	for i = 1, size-3 do
 		minetest.set_node({x = pos.x, y = pos.y + i, z = pos.z}, {name="ferns:fern_trunk_big"})
 	end
@@ -48,78 +67,26 @@ abstract_ferns.grow_giant_tree_fern = function(pos)
 
 	-- all the checking for air below is to prevent some ugly bugs (incomplete trunks of neighbouring trees), it's a bit slower, but worth the result
 
-	if minetest.get_node(leaf_a_1).name == "air" then
-		minetest.set_node(leaf_a_1, {name="ferns:tree_fern_leaf_big"})
-		if minetest.get_node(leaf_a_2).name == "air" then
-			minetest.set_node(leaf_a_2, {name="ferns:tree_fern_leaf_big"})
-			if minetest.get_node(leaf_a_3).name == "air" then
-				minetest.set_node(leaf_a_3, {name="ferns:tree_fern_leaf_big"})
-				if minetest.get_node(leaf_a_4).name == "air" then
-					minetest.set_node(leaf_a_4, {name="ferns:tree_fern_leaf_big_end", param2=3})
-				end
+	-- assert(#leafchecks == 4)
+	for i = 1, 4 do
+		local positions = leafchecks[i].positions
+		local rot = leafchecks[i].direction
+		local endpos = 4	-- If the loop below adds all intermediate leaves then the "terminating" leaf will be at positions[4]
+		-- assert(#positions == 4)
+		-- add leaves so long as the destination nodes are air
+		for j = 1, 3 do
+			if minetest.get_node(positions[j]).name == "air" then
+				minetest.set_node(positions[j], {name="ferns:tree_fern_leaf_big"})
+			else
+				endpos = j
+				break
 			end
 		end
-	end
-
-	if minetest.get_node(leaf_b_1).name == "air" then
-		minetest.set_node(leaf_b_1, {name="ferns:tree_fern_leaf_big"})
-		if minetest.get_node(leaf_b_2).name == "air" then
-			minetest.set_node(leaf_b_2, {name="ferns:tree_fern_leaf_big"})
-			if minetest.get_node(leaf_b_3).name == "air" then
-				minetest.set_node(leaf_b_3, {name="ferns:tree_fern_leaf_big"})
-				if minetest.get_node(leaf_b_4).name == "air" then
-					minetest.set_node(leaf_b_4, {name="ferns:tree_fern_leaf_big_end", param2=1})
-				end
-			end
+		-- add the terminating leaf if required and possible
+		if endpos == 4 and minetest.get_node(positions[endpos]).name == "air" then
+			minetest.set_node(positions[endpos], {name="ferns:tree_fern_leaf_big_end", param2=rot})
 		end
 	end
-
-	if minetest.get_node(leaf_c_1).name == "air" then
-		minetest.set_node(leaf_c_1, {name="ferns:tree_fern_leaf_big"})
-		if minetest.get_node(leaf_c_2).name == "air" then
-			minetest.set_node(leaf_c_2, {name="ferns:tree_fern_leaf_big"})
-			if minetest.get_node(leaf_c_3).name == "air" then
-				minetest.set_node(leaf_c_3, {name="ferns:tree_fern_leaf_big"})
-				if minetest.get_node(leaf_c_4).name == "air" then
-					minetest.set_node(leaf_c_4, {name="ferns:tree_fern_leaf_big_end", param2=2})
-				end
-			end
-		end
-	end
-
-	if minetest.get_node(leaf_d_1).name == "air" then
-		minetest.set_node(leaf_d_1, {name="ferns:tree_fern_leaf_big"})
-		if minetest.get_node(leaf_d_2).name == "air" then
-			minetest.set_node(leaf_d_2, {name="ferns:tree_fern_leaf_big"})
-			if minetest.get_node(leaf_d_3).name == "air" then
-				minetest.set_node(leaf_d_3, {name="ferns:tree_fern_leaf_big"})
-				if minetest.get_node(leaf_d_4).name == "air" then
-					minetest.set_node(leaf_d_4, {name="ferns:tree_fern_leaf_big_end", param2=0})
-				end
-			end
-		end
-	end
-
-	-- bug fixes # 2 - doesn't really work, so disabled for now
-	--[[if minetest.get_node(leaf_a_4).name == "ferns:tree_fern_leaf_big_end"
-	and minetest.get_node(leaf_a_3).name == "ferns:fern_trunk_big" then
-		minetest.set_node(leaf_a_4, {name="air"})
-	end
-
-	if minetest.get_node(leaf_b_4).name == "ferns:tree_fern_leaf_big_end"
-	and minetest.get_node(leaf_b_3).name == "ferns:fern_trunk_big" then
-		minetest.set_node(leaf_b_4, {name="air"})
-	end
-
-	if minetest.get_node(leaf_c_4).name == "ferns:tree_fern_leaf_big_end"
-	and minetest.get_node(leaf_c_3).name == "ferns:fern_trunk_big" then
-		minetest.set_node(leaf_c_4, {name="air"})
-	end
-
-	if minetest.get_node(leaf_d_4).name == "ferns:tree_fern_leaf_big_end"
-	and minetest.get_node(leaf_d_3).name == "ferns:fern_trunk_big" then
-		minetest.set_node(leaf_d_4, {name="air"})
-	end]]
 end
 
 -----------------------------------------------------------------------------------------------

From 64471c9bfce23c97dc7f87f02b7abaed753cd4a7 Mon Sep 17 00:00:00 2001
From: Craig Robbins <kde.psych@gmail.com>
Date: Wed, 20 Aug 2014 18:05:01 +1000
Subject: [PATCH 04/10] Renamed SeTTiNGS.txt to settings.lua

It's a Lua file... the extension should reflect what it actually is
---
 ferns/init.lua                       | 4 ++--
 ferns/{SeTTiNGS.txt => settings.lua} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename ferns/{SeTTiNGS.txt => settings.lua} (100%)

diff --git a/ferns/init.lua b/ferns/init.lua
index 2d389ce..7fad107 100644
--- a/ferns/init.lua
+++ b/ferns/init.lua
@@ -8,7 +8,7 @@ local mname		= "ferns" -- former "archaeplantae"
 -----------------------------------------------------------------------------------------------
 abstract_ferns = {}
 
-dofile(minetest.get_modpath("ferns").."/SeTTiNGS.txt")
+dofile(minetest.get_modpath("ferns").."/settings.lua")
 
 if Lady_fern == true then
 dofile(minetest.get_modpath("ferns").."/fern.lua")
@@ -30,4 +30,4 @@ dofile(minetest.get_modpath("ferns").."/crafting.lua")
 
 -----------------------------------------------------------------------------------------------
 print("[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...")
------------------------------------------------------------------------------------------------
\ No newline at end of file
+-----------------------------------------------------------------------------------------------
diff --git a/ferns/SeTTiNGS.txt b/ferns/settings.lua
similarity index 100%
rename from ferns/SeTTiNGS.txt
rename to ferns/settings.lua

From b069341d33ef91a957b2493999647545a98f76c5 Mon Sep 17 00:00:00 2001
From: Craig Robbins <kde.psych@gmail.com>
Date: Wed, 20 Aug 2014 18:35:08 +1000
Subject: [PATCH 05/10] Stop polluting global namespace

---
 ferns/fern.lua          | 221 ++++++++++++++++++++--------------------
 ferns/gianttreefern.lua |  99 +++++++++---------
 ferns/horsetail.lua     | 149 ++++++++++++++-------------
 ferns/init.lua          |  10 +-
 ferns/settings.lua      |  31 +++---
 ferns/treefern.lua      |  97 +++++++++---------
 6 files changed, 310 insertions(+), 297 deletions(-)

diff --git a/ferns/fern.lua b/ferns/fern.lua
index ef7e5b2..38071a8 100644
--- a/ferns/fern.lua
+++ b/ferns/fern.lua
@@ -127,123 +127,126 @@ plantslib:spawn_on_surfaces({
 	},
 	seed_diff = 329,
 })]]
-if Ferns_near_Tree == true then
-plantslib:register_generate_plant({ -- near trees (woodlands)
-    surface = {
-		"default:dirt_with_grass", 
-		"default:mossycobble", 
-		"default:desert_sand",
-		"default:sand",
-		"default:jungletree",
-		"stoneage:grass_with_silex",
-		"sumpf:sumpf"
+
+assert(abstract_ferns.config.Lady_fern == true)
+
+if abstract_ferns.config.Ferns_near_Tree == true then
+	plantslib:register_generate_plant({ -- near trees (woodlands)
+		surface = {
+			"default:dirt_with_grass",
+			"default:mossycobble",
+			"default:desert_sand",
+			"default:sand",
+			"default:jungletree",
+			"stoneage:grass_with_silex",
+			"sumpf:sumpf"
+		},
+		max_count = 30,
+		rarity = 62,--63,
+		min_elevation = 1, -- above sea level
+		near_nodes = {"group:tree"},
+		near_nodes_size = 3,--4,
+		near_nodes_vertical = 2,--3,
+		near_nodes_count = 1,
+		plantlife_limit = -0.9,
+		humidity_max = -1.0,
+		humidity_min = 0.4,
+		temp_max = -0.5, -- 55 °C (too hot?)
+		temp_min = 0.75, -- -12 °C
 	},
-    max_count = 30,
-    rarity = 62,--63,
-    min_elevation = 1, -- above sea level
-	near_nodes = {"group:tree"},
-	near_nodes_size = 3,--4,
-	near_nodes_vertical = 2,--3,
-	near_nodes_count = 1,
-    plantlife_limit = -0.9,
-    humidity_max = -1.0,
-    humidity_min = 0.4,
-    temp_max = -0.5, -- 55 °C (too hot?)
-    temp_min = 0.75, -- -12 °C
-  },
-  abstract_ferns.grow_fern
-)
+	abstract_ferns.grow_fern
+	)
 end
 
-if Ferns_near_Rock == true then
-plantslib:register_generate_plant({ -- near stone (mountains)
-    surface = {
-		"default:dirt_with_grass", 
-		"default:mossycobble", 
-		"group:falling_node", 
-		--"default:jungletree",
-		"stoneage:grass_with_silex",
-		"sumpf:sumpf"
+if abstract_ferns.config.Ferns_near_Rock == true then
+	plantslib:register_generate_plant({ -- near stone (mountains)
+		surface = {
+			"default:dirt_with_grass",
+			"default:mossycobble",
+			"group:falling_node",
+			--"default:jungletree",
+			"stoneage:grass_with_silex",
+			"sumpf:sumpf"
+		},
+		max_count = 35,
+		rarity = 40,
+		min_elevation = 1, -- above sea level
+		near_nodes = {"group:stone"},
+		near_nodes_size = 1,
+		near_nodes_count = 16,
+		plantlife_limit = -0.9,
+		humidity_max = -1.0,
+		humidity_min = 0.4,
+		temp_max = -0.5, -- 55 °C (too hot?)
+		temp_min = 0.75, -- -12 °C
 	},
-    max_count = 35,
-    rarity = 40,
-    min_elevation = 1, -- above sea level
-	near_nodes = {"group:stone"},
-	near_nodes_size = 1,
-	near_nodes_count = 16,
-    plantlife_limit = -0.9,
-    humidity_max = -1.0,
-    humidity_min = 0.4,
-    temp_max = -0.5, -- 55 °C (too hot?)
-    temp_min = 0.75, -- -12 °C
-  },
-  abstract_ferns.grow_fern
-)
+	abstract_ferns.grow_fern
+	)
 end
 
-if Ferns_near_Ores == true then -- this one causes a huge fps drop
-plantslib:register_generate_plant({ -- near ores (potential mining sites)
-    surface = {
-		"default:dirt_with_grass", 
-		"default:mossycobble",
-		"default:stone_with_coal",
-		"default:stone_with_iron",
-		"moreores:mineral_tin",
-		"moreores:mineral_silver",
-		"sumpf:sumpf"
+if abstract_ferns.config.Ferns_near_Ores == true then -- this one causes a huge fps drop
+	plantslib:register_generate_plant({ -- near ores (potential mining sites)
+		surface = {
+			"default:dirt_with_grass",
+			"default:mossycobble",
+			"default:stone_with_coal",
+			"default:stone_with_iron",
+			"moreores:mineral_tin",
+			"moreores:mineral_silver",
+			"sumpf:sumpf"
+		},
+		max_count = 1200,--1600, -- maybe too much? :D
+		rarity = 25,--15,
+		min_elevation = 1, -- above sea level
+		near_nodes = {
+			"default:stone_with_iron",
+			--"default:stone_with_copper",
+			--"default:stone_with_mese",
+			--"default:stone_with_gold",
+			--"default:stone_with_diamond",
+			"moreores:mineral_tin",
+			"moreores:mineral_silver"
+			--"moreores:mineral_mithril"
+		},
+		near_nodes_size = 2,
+		near_nodes_vertical = 4,--5,--6,
+		near_nodes_count = 2,--3,
+		plantlife_limit = -0.9,
+		humidity_max = -1.0,
+		humidity_min = 0.4,
+		temp_max = -0.5, -- 55 °C (too hot?)
+		temp_min = 0.75, -- -12 °C
 	},
-    max_count = 1200,--1600, -- maybe too much? :D
-    rarity = 25,--15,
-    min_elevation = 1, -- above sea level
-	near_nodes = {
-		"default:stone_with_iron",
-		--"default:stone_with_copper",
-		--"default:stone_with_mese",
-		--"default:stone_with_gold",
-		--"default:stone_with_diamond",
-		"moreores:mineral_tin",
-		"moreores:mineral_silver"
-		--"moreores:mineral_mithril"
-	},
-	near_nodes_size = 2,
-	near_nodes_vertical = 4,--5,--6,
-	near_nodes_count = 2,--3,
-    plantlife_limit = -0.9,
-    humidity_max = -1.0,
-    humidity_min = 0.4,
-    temp_max = -0.5, -- 55 °C (too hot?)
-    temp_min = 0.75, -- -12 °C
-  },
-  abstract_ferns.grow_fern
-)
+	abstract_ferns.grow_fern
+	)
 end
 
-if Ferns_in_Groups == true then -- this one is meant as a replacement of Ferns_near_Ores
-plantslib:register_generate_plant({
-    surface = {
-		"default:dirt_with_grass", 
-		"default:mossycobble",
-		"default:stone_with_coal",
-		"default:stone_with_iron",
-		"moreores:mineral_tin",
-		"moreores:mineral_silver",
-		"sumpf:sumpf"
+if abstract_ferns.config.Ferns_in_Groups == true then -- this one is meant as a replacement of Ferns_near_Ores
+	plantslib:register_generate_plant({
+		surface = {
+			"default:dirt_with_grass",
+			"default:mossycobble",
+			"default:stone_with_coal",
+			"default:stone_with_iron",
+			"moreores:mineral_tin",
+			"moreores:mineral_silver",
+			"sumpf:sumpf"
+		},
+		max_count = 70,
+		rarity = 25,--15,
+		min_elevation = 1, -- above sea level
+		near_nodes = {
+			"default:stone"
+		},
+		near_nodes_size = 2,
+		near_nodes_vertical = 2,--6,
+		near_nodes_count = 3,
+		plantlife_limit = -0.9,
+		humidity_max = -1.0,
+		humidity_min = 0.4,
+		temp_max = -0.5, -- 55 °C (too hot?)
+		temp_min = 0.75, -- -12 °C
 	},
-    max_count = 70,
-    rarity = 25,--15,
-    min_elevation = 1, -- above sea level
-	near_nodes = {
-		"default:stone"
-	},
-	near_nodes_size = 2,
-	near_nodes_vertical = 2,--6,
-	near_nodes_count = 3,
-    plantlife_limit = -0.9,
-    humidity_max = -1.0,
-    humidity_min = 0.4,
-    temp_max = -0.5, -- 55 °C (too hot?)
-    temp_min = 0.75, -- -12 °C
-  },
-  abstract_ferns.grow_fern
-)
+	abstract_ferns.grow_fern
+	)
 end
diff --git a/ferns/gianttreefern.lua b/ferns/gianttreefern.lua
index 624523e..d559962 100644
--- a/ferns/gianttreefern.lua
+++ b/ferns/gianttreefern.lua
@@ -276,58 +276,61 @@ minetest.register_abm({
 -----------------------------------------------------------------------------------------------
 -- GENERATE GIANT TREE FERN
 -----------------------------------------------------------------------------------------------
+
+assert(abstract_ferns.config.Giant_Tree_Fern == true)
+
 -- in jungles
-if Giant_Tree_Ferns_in_Jungle == true then
-plantslib:register_generate_plant({
-    surface = {
-		"default:dirt_with_grass", 
-		"default:sand", 
-		"default:desert_sand"--, 
-		--"dryplants:grass_short"
+if abstract_ferns.config.Giant_Tree_Ferns_in_Jungle == true then
+	plantslib:register_generate_plant({
+		surface = {
+			"default:dirt_with_grass",
+			"default:sand",
+			"default:desert_sand"--,
+			--"dryplants:grass_short"
+		},
+		max_count = 12,--27,
+		avoid_nodes = {"group:tree"},
+		avoid_radius = 3,--4,
+		rarity = 85,
+		seed_diff = 329,
+		min_elevation = 1,
+		near_nodes = {"default:jungletree"},
+		near_nodes_size = 6,
+		near_nodes_vertical = 2,--4,
+		near_nodes_count = 1,
+		plantlife_limit = -0.9,
+		--humidity_max = 0.39,--1.0,
+		--humidity_min = 0.5,
+		--temp_max = -1,-- -1.2,-- -0.5, -- ~ 55C
+		--temp_min = -0.35,-- -0.07, -- ~ 25C
 	},
-    max_count = 12,--27,
-    avoid_nodes = {"group:tree"},
-    avoid_radius = 3,--4,
-    rarity = 85,
-    seed_diff = 329,
-    min_elevation = 1,
-	near_nodes = {"default:jungletree"},
-	near_nodes_size = 6,
-	near_nodes_vertical = 2,--4,
-	near_nodes_count = 1,
-    plantlife_limit = -0.9,
-    --humidity_max = 0.39,--1.0,
-    --humidity_min = 0.5,
-    --temp_max = -1,-- -1.2,-- -0.5, -- ~ 55C
-    --temp_min = -0.35,-- -0.07, -- ~ 25C
-  },
-  abstract_ferns.grow_giant_tree_fern
-)
+	abstract_ferns.grow_giant_tree_fern
+	)
 end
 
 -- for oases & tropical beaches
-if Giant_Tree_Ferns_for_Oases == true then
-plantslib:register_generate_plant({
-    surface = {
-		"default:sand"--,
-		--"default:desert_sand"
+if abstract_ferns.config.Giant_Tree_Ferns_for_Oases == true then
+	plantslib:register_generate_plant({
+		surface = {
+			"default:sand"--,
+			--"default:desert_sand"
+		},
+		max_count = 10,--27,
+		rarity = 90,
+		seed_diff = 329,
+		neighbors = {"default:desert_sand"},
+		ncount = 1,
+		min_elevation = 1,
+		near_nodes = {"default:water_source"},
+		near_nodes_size = 2,
+		near_nodes_vertical = 1,
+		near_nodes_count = 1,
+		plantlife_limit = -0.9,
+		humidity_max = -1.0,
+		humidity_min = 1.0,
+		temp_max = -1.0,
+		temp_min = 1.0,
 	},
-    max_count = 10,--27,
-    rarity = 90,
-    seed_diff = 329,
-	neighbors = {"default:desert_sand"},
-	ncount = 1,
-    min_elevation = 1,
-	near_nodes = {"default:water_source"},
-	near_nodes_size = 2,
-	near_nodes_vertical = 1,
-	near_nodes_count = 1,
-    plantlife_limit = -0.9,
-    humidity_max = -1.0,
-    humidity_min = 1.0,
-    temp_max = -1.0,
-    temp_min = 1.0,
-  },
-  abstract_ferns.grow_giant_tree_fern
-)
+	abstract_ferns.grow_giant_tree_fern
+	)
 end
diff --git a/ferns/horsetail.lua b/ferns/horsetail.lua
index bfab07e..7b480b0 100644
--- a/ferns/horsetail.lua
+++ b/ferns/horsetail.lua
@@ -94,85 +94,88 @@ minetest.register_node("ferns:horsetail_04", { -- the one in inventory
 -----------------------------------------------------------------------------------------------
 -- Spawning
 -----------------------------------------------------------------------------------------------
-if Horsetails_Spawning == true then
-plantslib:spawn_on_surfaces({
-	spawn_delay = 1200,
-	spawn_plants = {
-		"ferns:horsetail_01", 
-		"ferns:horsetail_02", 
-		"ferns:horsetail_03", 
-		"ferns:horsetail_04"
-	},
-	spawn_chance = 400,
-	spawn_surfaces = {
-		"default:dirt_with_grass",
-		"default:desert_sand",
-		"default:sand",
-		"dryplants:grass_short",
-		"stoneage:grass_with_silex",
-		"default:mossycobble",
-		"default:gravel"
-	},
-	seed_diff = 329,
-	min_elevation = 1, -- above sea level
-	near_nodes = {"default:water_source","default:gravel"},
-	near_nodes_size = 2,
-	near_nodes_vertical = 1,
-	near_nodes_count = 1,
-})
+if abstract_ferns.config.Horsetails_Spawning == true then
+	plantslib:spawn_on_surfaces({
+		spawn_delay = 1200,
+		spawn_plants = {
+			"ferns:horsetail_01",
+			"ferns:horsetail_02",
+			"ferns:horsetail_03",
+			"ferns:horsetail_04"
+		},
+		spawn_chance = 400,
+		spawn_surfaces = {
+			"default:dirt_with_grass",
+			"default:desert_sand",
+			"default:sand",
+			"dryplants:grass_short",
+			"stoneage:grass_with_silex",
+			"default:mossycobble",
+			"default:gravel"
+		},
+		seed_diff = 329,
+		min_elevation = 1, -- above sea level
+		near_nodes = {"default:water_source","default:gravel"},
+		near_nodes_size = 2,
+		near_nodes_vertical = 1,
+		near_nodes_count = 1,
+	})
 end
 -----------------------------------------------------------------------------------------------
 -- Generating
 -----------------------------------------------------------------------------------------------
-if Horsetails_on_Grass == true then
-plantslib:register_generate_plant({
-    surface = {
-		"default:dirt_with_grass",
-		"sumpf:sumpf"
+
+assert(abstract_ferns.config.Horsetails == true)
+
+if abstract_ferns.config.Horsetails_on_Grass == true then
+	plantslib:register_generate_plant({
+		surface = {
+			"default:dirt_with_grass",
+			"sumpf:sumpf"
+		},
+		max_count = 35,
+		rarity = 40,
+		min_elevation = 1, -- above sea level
+		near_nodes = {
+			"group:water", -- likes water (of course)
+			"default:gravel", -- near those on gravel
+			"default:sand", -- some like sand
+			"default:clay", -- some like clay
+			"stoneage:grass_with_silex",
+			"default:mossycobble",
+			"default:cobble",
+			"sumpf:sumpf"
+		},
+		near_nodes_size = 3,
+		near_nodes_vertical = 2,--3,
+		near_nodes_count = 1,
+		plantlife_limit = -0.9,
+		humidity_min = 0.4,
+		temp_max = -0.5, -- 55 °C
+		temp_min = 0.53, -- 0 °C, dies back in winter
 	},
-    max_count = 35,
-    rarity = 40,
-    min_elevation = 1, -- above sea level
-	near_nodes = {
-		"group:water", -- likes water (of course)
-		"default:gravel", -- near those on gravel
-		"default:sand", -- some like sand
-		"default:clay", -- some like clay
-		"stoneage:grass_with_silex",
-		"default:mossycobble",
-		"default:cobble",
-		"sumpf:sumpf"
-	},
-	near_nodes_size = 3,
-	near_nodes_vertical = 2,--3,
-	near_nodes_count = 1,
-    plantlife_limit = -0.9,
-    humidity_min = 0.4,
-    temp_max = -0.5, -- 55 °C
-    temp_min = 0.53, -- 0 °C, dies back in winter
-  },
-  abstract_ferns.grow_horsetail
-)
+	abstract_ferns.grow_horsetail
+	)
 end
 
-if Horsetails_on_Stony == true then
-plantslib:register_generate_plant({
-    surface = {
-		"default:gravel", -- roots go deep
-		"default:mossycobble",
-		"stoneage:dirt_with_silex",
-		"stoneage:grass_with_silex",
-		"stoneage:sand_with_silex"--, -- roots go deep
-		--"sumpf:sumpf"
+if abstract_ferns.config.Horsetails_on_Stony == true then
+	plantslib:register_generate_plant({
+		surface = {
+			"default:gravel", -- roots go deep
+			"default:mossycobble",
+			"stoneage:dirt_with_silex",
+			"stoneage:grass_with_silex",
+			"stoneage:sand_with_silex"--, -- roots go deep
+			--"sumpf:sumpf"
+		},
+		max_count = 35,
+		rarity = 20,
+		min_elevation = 1, -- above sea level
+		plantlife_limit = -0.9,
+		humidity_min = 0.4,
+		temp_max = -0.5, -- 55 °C
+		temp_min = 0.53, -- 0 °C, dies back in winter
 	},
-    max_count = 35,
-    rarity = 20,
-    min_elevation = 1, -- above sea level
-	plantlife_limit = -0.9,
-    humidity_min = 0.4,
-    temp_max = -0.5, -- 55 °C
-    temp_min = 0.53, -- 0 °C, dies back in winter
-  },
-  abstract_ferns.grow_horsetail
-)
+	abstract_ferns.grow_horsetail
+	)
 end
diff --git a/ferns/init.lua b/ferns/init.lua
index 7fad107..9ff293d 100644
--- a/ferns/init.lua
+++ b/ferns/init.lua
@@ -10,19 +10,19 @@ abstract_ferns = {}
 
 dofile(minetest.get_modpath("ferns").."/settings.lua")
 
-if Lady_fern == true then
-dofile(minetest.get_modpath("ferns").."/fern.lua")
+if abstract_ferns.config.Lady_fern == true then
+	dofile(minetest.get_modpath("ferns").."/fern.lua")
 end
 
-if Horsetails == true then
+if abstract_ferns.Horsetails == true then
 	dofile(minetest.get_modpath("ferns").."/horsetail.lua")
 end
 
-if Tree_Fern == true then
+if abstract_ferns.config.Tree_Fern == true then
 	dofile(minetest.get_modpath("ferns").."/treefern.lua")
 end
 
-if Giant_Tree_Fern == true then
+if abstract_ferns.config.Giant_Tree_Fern == true then
 	dofile(minetest.get_modpath("ferns").."/gianttreefern.lua")
 end
 
diff --git a/ferns/settings.lua b/ferns/settings.lua
index e34d2ba..ce9cbc7 100644
--- a/ferns/settings.lua
+++ b/ferns/settings.lua
@@ -13,30 +13,31 @@
 
 -- If something is still unclear, don't hesitate to post your question @ https://forum.minetest.net/viewtopic.php?id=6921
 
+abstract_ferns.config = {}
 
 -- Which plants should generate/spawn?
-Lady_fern		= true
-Horsetails 		= true
-Tree_Fern 		= true
-Giant_Tree_Fern = true
+abstract_ferns.config.Lady_fern			= true
+abstract_ferns.config.Horsetails 		= true
+abstract_ferns.config.Tree_Fern 		= true
+abstract_ferns.config.Giant_Tree_Fern 	= true
 
 -- Where should they generate/spawn? (if they generate/spawn)
 --
 --  Lady-Fern
-Ferns_near_Tree = true				
-Ferns_near_Rock = true				
-Ferns_near_Ores = true				-- if there's a bunch of ferns there's ores nearby, this one causes a huge fps drop
-Ferns_in_Groups = false				-- this one is meant as a replacement of Ferns_near_Ores: ferns tend to generate in groups, less fps drop, no hint for nearby ores
+abstract_ferns.config.Ferns_near_Tree = true
+abstract_ferns.config.Ferns_near_Rock = true
+abstract_ferns.config.Ferns_near_Ores = true				-- if there's a bunch of ferns there's ores nearby, this one causes a huge fps drop
+abstract_ferns.config.Ferns_in_Groups = false				-- this one is meant as a replacement of Ferns_near_Ores: ferns tend to generate in groups, less fps drop, no hint for nearby ores
 --
 --	Horsetails
-Horsetails_Spawning = false			-- horsetails will grow in already explored areas, over time, near water or gravel
-Horsetails_on_Grass = true			-- on dirt with grass and swamp (sumpf mod)
-Horsetails_on_Stony = true			-- on gravel, mossy cobble and silex (stoneage mod)
+abstract_ferns.config.Horsetails_Spawning = false			-- horsetails will grow in already explored areas, over time, near water or gravel
+abstract_ferns.config.Horsetails_on_Grass = true			-- on dirt with grass and swamp (sumpf mod)
+abstract_ferns.config.Horsetails_on_Stony = true			-- on gravel, mossy cobble and silex (stoneage mod)
 --
 -- Tree_Fern
-Tree_Ferns_in_Jungle = true			
-Tree_Ferns_for_Oases = true			-- for oases and tropical beaches
+abstract_ferns.config.Tree_Ferns_in_Jungle = true
+abstract_ferns.config.Tree_Ferns_for_Oases = true			-- for oases and tropical beaches
 --
 -- Giant_Tree_Fern
-Giant_Tree_Ferns_in_Jungle = true	
-Giant_Tree_Ferns_for_Oases = true	-- for oases and tropical beaches
+abstract_ferns.config.Giant_Tree_Ferns_in_Jungle = true
+abstract_ferns.config.Giant_Tree_Ferns_for_Oases = true		-- for oases and tropical beaches
diff --git a/ferns/treefern.lua b/ferns/treefern.lua
index a507620..ce034dc 100644
--- a/ferns/treefern.lua
+++ b/ferns/treefern.lua
@@ -188,58 +188,61 @@ minetest.register_abm({
 -----------------------------------------------------------------------------------------------
 -- GENERATE TREE FERN
 -----------------------------------------------------------------------------------------------
+
+assert(abstract_ferns.config.Tree_Fern == true)
+
 -- in jungles
-if Tree_Ferns_in_Jungle == true	then
-plantslib:register_generate_plant({
-    surface = {
-		"default:dirt_with_grass", 
-		"default:sand", 
-		"default:desert_sand"--, 
-		--"dryplants:grass_short"
+if abstract_ferns.config.Tree_Ferns_in_Jungle == true then
+	plantslib:register_generate_plant({
+		surface = {
+			"default:dirt_with_grass",
+			"default:sand",
+			"default:desert_sand"--,
+			--"dryplants:grass_short"
+		},
+		max_count = 35,--27,
+		avoid_nodes = {"default:tree"},
+		avoid_radius = 4,
+		rarity = 50,
+		seed_diff = 329,
+		min_elevation = -10,
+		near_nodes = {"default:jungletree"},
+		near_nodes_size = 6,
+		near_nodes_vertical = 2,--4,
+		near_nodes_count = 1,
+		plantlife_limit = -0.9,
+		humidity_max = -1.0,
+		humidity_min = 0.4,
+		temp_max = -0.5,
+		temp_min = 0.13,
 	},
-    max_count = 35,--27,
-    avoid_nodes = {"default:tree"},
-    avoid_radius = 4,
-    rarity = 50,
-    seed_diff = 329,
-    min_elevation = -10,
-	near_nodes = {"default:jungletree"},
-	near_nodes_size = 6,
-	near_nodes_vertical = 2,--4,
-	near_nodes_count = 1,
-    plantlife_limit = -0.9,
-    humidity_max = -1.0,
-    humidity_min = 0.4,
-    temp_max = -0.5,
-    temp_min = 0.13,
-  },
-  abstract_ferns.grow_tree_fern
-)
+	abstract_ferns.grow_tree_fern
+	)
 end
 
 -- for oases & tropical beaches
-if Tree_Ferns_for_Oases == true then
-plantslib:register_generate_plant({
-    surface = {
-		"default:sand"--,
-		--"default:desert_sand"
+if abstract_ferns.config.Tree_Ferns_for_Oases == true then
+	plantslib:register_generate_plant({
+		surface = {
+			"default:sand"--,
+			--"default:desert_sand"
+		},
+		max_count = 35,
+		rarity = 50,
+		seed_diff = 329,
+		neighbors = {"default:desert_sand"},
+		ncount = 1,
+		min_elevation = 1,
+		near_nodes = {"default:water_source"},
+		near_nodes_size = 2,
+		near_nodes_vertical = 1,
+		near_nodes_count = 1,
+		plantlife_limit = -0.9,
+		humidity_max = -1.0,
+		humidity_min = 1.0,
+		temp_max = -1.0,
+		temp_min = 1.0,
 	},
-    max_count = 35,
-    rarity = 50,
-    seed_diff = 329,
-	neighbors = {"default:desert_sand"},
-	ncount = 1,
-    min_elevation = 1,
-	near_nodes = {"default:water_source"},
-	near_nodes_size = 2,
-	near_nodes_vertical = 1,
-	near_nodes_count = 1,
-    plantlife_limit = -0.9,
-    humidity_max = -1.0,
-    humidity_min = 1.0,
-    temp_max = -1.0,
-    temp_min = 1.0,
-  },
-  abstract_ferns.grow_tree_fern
+	abstract_ferns.grow_tree_fern
 )
 end

From abdf76566a1eda829c5c8cddc79a7b3a54eb4c9f Mon Sep 17 00:00:00 2001
From: Craig Robbins <kde.psych@gmail.com>
Date: Wed, 20 Aug 2014 18:36:13 +1000
Subject: [PATCH 06/10] Bump minor version number

---
 ferns/init.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ferns/init.lua b/ferns/init.lua
index 9ff293d..1e5079f 100644
--- a/ferns/init.lua
+++ b/ferns/init.lua
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------------------------
 local title		= "Ferns" -- former "Archae Plantae"
-local version 	= "0.1.2"
+local version 	= "0.2.0"
 local mname		= "ferns" -- former "archaeplantae"
 -----------------------------------------------------------------------------------------------
 -- (by Mossmanikin)

From 655cff9f76d9e5a6736f7ef0d51c1d37d9a50c77 Mon Sep 17 00:00:00 2001
From: Craig Robbins <kde.psych@gmail.com>
Date: Wed, 20 Aug 2014 20:37:48 +1000
Subject: [PATCH 07/10] Removed obsolete or useless code

Some commented code makes no sense because there is not comment as to why it's commented out. Removed.
---
 ferns/fern.lua          | 26 --------------------------
 ferns/gianttreefern.lua |  6 ------
 ferns/treefern.lua      |  3 +--
 3 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/ferns/fern.lua b/ferns/fern.lua
index 38071a8..7a090b2 100644
--- a/ferns/fern.lua
+++ b/ferns/fern.lua
@@ -101,32 +101,6 @@ minetest.register_node("ferns:fern_01", {
 -----------------------------------------------------------------------------------------------
 -- Spawning
 -----------------------------------------------------------------------------------------------
---[[plantslib:spawn_on_surfaces({
-	spawn_delay = 1200,
-	spawn_plants = {"ferns:fern"},
-	spawn_chance = 800,
-	spawn_surfaces = {
-		"default:dirt_with_grass", 
-		"default:mossycobble", 
-		"dryplants:grass_short", 
-		"default:jungletree",
-		"stoneage:grass_with_silex"
-	},
-	seed_diff = 329,
-})
-plantslib:spawn_on_surfaces({
-	spawn_delay = 1200,
-	spawn_plants = {"ferns:fern_mid"},
-	spawn_chance = 400,
-	spawn_surfaces = {
-		"default:dirt_with_grass", 
-		"default:mossycobble", 
-		"dryplants:grass_short", 
-		"default:jungletree",
-		"stoneage:grass_with_silex"
-	},
-	seed_diff = 329,
-})]]
 
 assert(abstract_ferns.config.Lady_fern == true)
 
diff --git a/ferns/gianttreefern.lua b/ferns/gianttreefern.lua
index d559962..09fa613 100644
--- a/ferns/gianttreefern.lua
+++ b/ferns/gianttreefern.lua
@@ -98,8 +98,6 @@ minetest.register_node("ferns:tree_fern_leafs_giant", {
 	visual_scale = math.sqrt(8),
 	wield_scale = {x=0.175, y=0.175, z=0.175},
 	paramtype = "light",
-	--paramtype2 = "facedir",
-	--tiles = {"[combine:"..TSS..T1.."ferns_5.png"..T2.."ferns_6.png"..T3.."ferns_7.png"..T4.."ferns_8.png^[transformFX^[combine:"..TSS..T1.."ferns_5.png"..T2.."ferns_6.png"..T3.."ferns_7.png"..T4.."ferns_8.png"},
 	tiles = {"ferns_fern_tree_giant.png"},
 	inventory_image = "ferns_fern_tree.png",
 	walkable = false,
@@ -299,10 +297,6 @@ if abstract_ferns.config.Giant_Tree_Ferns_in_Jungle == true then
 		near_nodes_vertical = 2,--4,
 		near_nodes_count = 1,
 		plantlife_limit = -0.9,
-		--humidity_max = 0.39,--1.0,
-		--humidity_min = 0.5,
-		--temp_max = -1,-- -1.2,-- -0.5, -- ~ 55C
-		--temp_min = -0.35,-- -0.07, -- ~ 25C
 	},
 	abstract_ferns.grow_giant_tree_fern
 	)
diff --git a/ferns/treefern.lua b/ferns/treefern.lua
index ce034dc..01e2d2c 100644
--- a/ferns/treefern.lua
+++ b/ferns/treefern.lua
@@ -197,8 +197,7 @@ if abstract_ferns.config.Tree_Ferns_in_Jungle == true then
 		surface = {
 			"default:dirt_with_grass",
 			"default:sand",
-			"default:desert_sand"--,
-			--"dryplants:grass_short"
+			"default:desert_sand",
 		},
 		max_count = 35,--27,
 		avoid_nodes = {"default:tree"},

From 27156fdd71f6d2f50723c892c62570e7b8f08f43 Mon Sep 17 00:00:00 2001
From: Craig Robbins <kde.psych@gmail.com>
Date: Wed, 20 Aug 2014 21:51:32 +1000
Subject: [PATCH 08/10] derp

---
 ferns/gianttreefern.lua | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ferns/gianttreefern.lua b/ferns/gianttreefern.lua
index 09fa613..b90323d 100644
--- a/ferns/gianttreefern.lua
+++ b/ferns/gianttreefern.lua
@@ -63,7 +63,7 @@ abstract_ferns.grow_giant_tree_fern = function(pos)
 		minetest.set_node({x = pos.x, y = pos.y + i, z = pos.z}, {name="ferns:fern_trunk_big"})
 	end
 	minetest.set_node({x = pos.x, y = pos.y + size-2, z = pos.z}, {name="ferns:fern_trunk_big_top"})
-	minetest.set_node({x = pos.x, y = pos.y + size-1, z = pos.z}, {name="ferns:tree_fern_leafs_giant"})
+	minetest.set_node({x = pos.x, y = pos.y + size-1, z = pos.z}, {name="ferns:tree_fern_leaves_giant"})
 
 	-- all the checking for air below is to prevent some ugly bugs (incomplete trunks of neighbouring trees), it's a bit slower, but worth the result
 
@@ -76,7 +76,7 @@ abstract_ferns.grow_giant_tree_fern = function(pos)
 		-- add leaves so long as the destination nodes are air
 		for j = 1, 3 do
 			if minetest.get_node(positions[j]).name == "air" then
-				minetest.set_node(positions[j], {name="ferns:tree_fern_leaf_big"})
+				minetest.set_node(positions[j], {name="ferns:tree_fern_leaves_big"})
 			else
 				endpos = j
 				break
@@ -84,7 +84,7 @@ abstract_ferns.grow_giant_tree_fern = function(pos)
 		end
 		-- add the terminating leaf if required and possible
 		if endpos == 4 and minetest.get_node(positions[endpos]).name == "air" then
-			minetest.set_node(positions[endpos], {name="ferns:tree_fern_leaf_big_end", param2=rot})
+			minetest.set_node(positions[endpos], {name="ferns:tree_fern_leaves_big_end", param2=rot})
 		end
 	end
 end
@@ -92,7 +92,7 @@ end
 -----------------------------------------------------------------------------------------------
 -- GIANT TREE FERN LEAVES
 -----------------------------------------------------------------------------------------------
-minetest.register_node("ferns:tree_fern_leafs_giant", {
+minetest.register_node("ferns:tree_fern_leaves_giant", {
 	description = "Tree Fern Crown (Dicksonia)",
 	drawtype = "plantlike",
 	visual_scale = math.sqrt(8),
@@ -115,7 +115,7 @@ minetest.register_node("ferns:tree_fern_leafs_giant", {
 				rarity = 40,
 			},
 			{
-				items = {"ferns:tree_fern_leafs_giant"},
+				items = {"ferns:tree_fern_leaves_giant"},
 			}
 		}
 	},
@@ -128,7 +128,7 @@ minetest.register_node("ferns:tree_fern_leafs_giant", {
 -----------------------------------------------------------------------------------------------
 -- GIANT TREE FERN LEAVE PART
 -----------------------------------------------------------------------------------------------
-minetest.register_node("ferns:tree_fern_leaf_big", {
+minetest.register_node("ferns:tree_fern_leave_big", {
 	description = "Giant Tree Fern Leaves",
 	drawtype = "raillike",
 	paramtype = "light",
@@ -149,7 +149,7 @@ minetest.register_node("ferns:tree_fern_leaf_big", {
 -----------------------------------------------------------------------------------------------
 -- GIANT TREE FERN LEAVE END
 -----------------------------------------------------------------------------------------------
-minetest.register_node("ferns:tree_fern_leaf_big_end", {
+minetest.register_node("ferns:tree_fern_leave_big_end", {
 	description = "Giant Tree Fern Leave End",
 	drawtype = "nodebox",
 	paramtype = "light",

From cd0735203a0b46c4ed3f32b701503627d7865f77 Mon Sep 17 00:00:00 2001
From: Craig Robbins <kde.psych@gmail.com>
Date: Wed, 20 Aug 2014 22:21:21 +1000
Subject: [PATCH 09/10] typo (bug fix)

---
 ferns/init.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ferns/init.lua b/ferns/init.lua
index 1e5079f..1614223 100644
--- a/ferns/init.lua
+++ b/ferns/init.lua
@@ -14,7 +14,7 @@ if abstract_ferns.config.Lady_fern == true then
 	dofile(minetest.get_modpath("ferns").."/fern.lua")
 end
 
-if abstract_ferns.Horsetails == true then
+if abstract_ferns.config.Horsetails == true then
 	dofile(minetest.get_modpath("ferns").."/horsetail.lua")
 end
 

From 38d972d58e70c97069324b7c293abc4b8f4c8cec Mon Sep 17 00:00:00 2001
From: Craig Robbins <kde.psych@gmail.com>
Date: Wed, 20 Aug 2014 22:43:32 +1000
Subject: [PATCH 10/10] Fixed stupid node names

---
 ferns/gianttreefern.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ferns/gianttreefern.lua b/ferns/gianttreefern.lua
index b90323d..9674db2 100644
--- a/ferns/gianttreefern.lua
+++ b/ferns/gianttreefern.lua
@@ -76,7 +76,7 @@ abstract_ferns.grow_giant_tree_fern = function(pos)
 		-- add leaves so long as the destination nodes are air
 		for j = 1, 3 do
 			if minetest.get_node(positions[j]).name == "air" then
-				minetest.set_node(positions[j], {name="ferns:tree_fern_leaves_big"})
+				minetest.set_node(positions[j], {name="ferns:tree_fern_leave_big"})
 			else
 				endpos = j
 				break
@@ -84,7 +84,7 @@ abstract_ferns.grow_giant_tree_fern = function(pos)
 		end
 		-- add the terminating leaf if required and possible
 		if endpos == 4 and minetest.get_node(positions[endpos]).name == "air" then
-			minetest.set_node(positions[endpos], {name="ferns:tree_fern_leaves_big_end", param2=rot})
+			minetest.set_node(positions[endpos], {name="ferns:tree_fern_leave_big_end", param2=rot})
 		end
 	end
 end