remove acacia trees entirely.

they're handled by minetest_game now (have been for a while)
only some aliases and an "avoid" setting for other trees remain.

6 files changed, 1 insertions, 61 deletions

diff --git a/biome_defs.lua b/biome_defs.lua
index 463f4b8..c080ed0 100644
--- a/biome_defs.lua
+++ b/biome_defs.lua
@@ -124,18 +124,6 @@ moretrees.willow_biome = {
 	max_count = 5,
 }
 
-moretrees.acacia_biome = {
-	surface = { "default:dirt_with_grass", "default:dirt_with_dry_grass", "default:desert_sand" },
-	avoid_nodes = moretrees.avoidnodes,
-	avoid_radius = 15,
-	seed_diff = 1,
-	rarity = 50,
-	max_count = 15,
-	plantlife_limit = -1,
-	humidity_min = 0.3,
-	humidity_max = 0,
-}
-
 moretrees.rubber_tree_biome = {
 	surface = "default:dirt_with_grass",
 	avoid_nodes = moretrees.avoidnodes,
diff --git a/default_settings.txt b/default_settings.txt
index 0925d88..6aa64b5 100644
--- a/default_settings.txt
+++ b/default_settings.txt
@@ -10,7 +10,6 @@ moretrees.enable_date_palm		= true
 moretrees.enable_cedar			= true
 moretrees.enable_rubber_tree	= true
 moretrees.enable_willow			= true
-moretrees.enable_acacia			= true
 moretrees.enable_birch			= true
 moretrees.enable_spruce			= true
 moretrees.enable_jungle_tree	= true
diff --git a/init.lua b/init.lua
index 8189ffd..c9813db 100644
--- a/init.lua
+++ b/init.lua
@@ -91,7 +91,6 @@ if moretrees.spawn_saplings then
 	moretrees.spawn_cedar_object = "moretrees:cedar_sapling_ongen"
 	moretrees.spawn_rubber_tree_object = "moretrees:rubber_tree_sapling_ongen"
 	moretrees.spawn_willow_object = "moretrees:willow_sapling_ongen"
-	moretrees.spawn_acacia_object = "moretrees:acacia_sapling_ongen"
 	moretrees.spawn_birch_object = "moretrees:birch_sapling_ongen"
 	moretrees.spawn_spruce_object = "moretrees:spruce_sapling_ongen"
 	moretrees.spawn_jungletree_object = "moretrees:jungletree_sapling_ongen"
@@ -109,7 +108,6 @@ else
 	moretrees.spawn_cedar_object = moretrees.cedar_model
 	moretrees.spawn_rubber_tree_object = moretrees.rubber_tree_model
 	moretrees.spawn_willow_object = moretrees.willow_model
-	moretrees.spawn_acacia_object = moretrees.acacia_model
 	moretrees.spawn_birch_object = "moretrees.grow_birch"
 	moretrees.spawn_spruce_object = "moretrees.grow_spruce"
 	moretrees.spawn_jungletree_object = "moretrees.grow_jungletree"
@@ -156,10 +154,6 @@ if moretrees.enable_willow then
 	biome_lib:register_generate_plant(moretrees.willow_biome, moretrees.spawn_willow_object)
 end
 
-if moretrees.enable_acacia then
-	biome_lib:register_generate_plant(moretrees.acacia_biome, moretrees.spawn_acacia_object)
-end
-
 if moretrees.enable_birch then
 	biome_lib:register_generate_plant(moretrees.birch_biome, moretrees.spawn_birch_object)
 end
diff --git a/node_defs.lua b/node_defs.lua
index 1a02a9a..c0c9eb6 100644
--- a/node_defs.lua
+++ b/node_defs.lua
@@ -19,7 +19,6 @@ moretrees.treelist = {
 	{"fir",			"Douglas Fir",		"fir_cone",		"Fir Cone",		{-0.2, -0.5, -0.2, 0.2, 0, 0.2},	0.8 },
 
 	{"jungletree",	"Jungle Tree",		nil,			nil,			nil,								nil, "default_junglesapling.png"  },
-	{"acacia",		"Acacia Tree",		nil,			nil,			nil,								nil, "default_acacia_sapling.png" },
 }
 
 local dirs1 = { 21, 20, 23, 22, 21 }
@@ -86,8 +85,7 @@ for i in ipairs(moretrees.treelist) do
 		decay = moretrees.palm_leafdecay_radius
 	end
 
-	if treename ~= "jungletree"  -- the default game provides jungle tree, acacia, and pine trunk/planks nodes.
-		and treename ~= "acacia"
+	if treename ~= "jungletree"  -- the default game provides jungle tree and pine trunk/planks nodes.
 		and treename ~= "poplar_small"
 		and treename ~= "pine" then
 
@@ -264,7 +262,6 @@ for i in ipairs(moretrees.treelist) do
 	end
 
 	if treename ~= "jungletree"
-		and treename ~= "acacia"
 		and treename ~= "poplar_small"
 		and treename ~= "pine" then
 			print("called default.register_leafdecay for:")
@@ -436,7 +433,6 @@ if moretrees.spawn_saplings then
 		table.insert(moretrees.avoidnodes, "snow:sapling_pine")
 		table.insert(moretrees.avoidnodes, "default:junglesapling")
 		table.insert(moretrees.avoidnodes, "default:pine_sapling")
-		table.insert(moretrees.avoidnodes, "default:acacia_sapling")
 end
 
 -- "empty" (tapped) rubber tree nodes
diff --git a/tree_biomes.txt b/tree_biomes.txt
index 0dd0345..98bb2b1 100644
--- a/tree_biomes.txt
+++ b/tree_biomes.txt
@@ -15,8 +15,6 @@ birch		+10 to +15	-20 to +10	  n/a		n/a	dirt_with grass		334		 5
 spruce		 above +20	-20 to +10	  n/a		n/a	dirt_with grass		335		10

 cedar		    n/a		    n/a		water, 15	   5	dirt_with grass		336		10

 willow		- 5 to + 5	    n/a		water, 15	   5	dirt_with grass		337		20

-acacia		    n/a		    n/a		  n/a		n/a	dirt_with_grass,

-									desert_sand		n/a		15

 rubber		- 5 to + 5	 above +32	water, 15	  10	dirt_with_grass		338		20

 poplar		    n/a		-10 to +26	water, 15h,5v	   1	dirt_with_grass		341,342,343	10

 

@@ -29,10 +27,6 @@ Notes:
 Beech trees are meant to replace default trees, but are themselves disabled by default.  They grow in the same areas

 as the default ones do, and under the same conditions.

 

-Acacia trees depend on humidity as their primary control, and they don't use the fertile ground option. They grow near

-the edges of a desert biome, occasionally into the grass beyond, and anywhere else on desert sand or dirt with grass,

-where the humidity is low (but not bone dry).

-

 Fir trees appear in a snow biome only with older versions of SPlizard's Snow Biomes mod.  In more recent versions,

 these trees will not grow, due to an engine bug.

 

diff --git a/tree_models.lua b/tree_models.lua
index 9372fe9..879a32a 100644
--- a/tree_models.lua
+++ b/tree_models.lua
@@ -230,37 +230,6 @@ moretrees.willow_model={
 	thin_branches=true
 }
 
-moretrees.acacia_model={
-	axiom="FFFFFFccccA",
-	rules_a = "[B]//[B]//[B]//[B]",
-	rules_b = "&TTTT&TT^^G&&----GGGGGG++GGG++"	-- line up with the "canvas" edge
-			.."fffffffGG++G++"					-- first layer, drawn in a zig-zag raster pattern
-			.."Gffffffff--G--"
-			.."ffffffffG++G++"
-			.."fffffffff--G--"
-			.."fffffffff++G++"
-			.."fffffffff--G--"
-			.."ffffffffG++G++"
-			.."Gffffffff--G--"
-			.."fffffffGG"
-			.."^^G&&----GGGGGGG++GGGGGG++"		-- re-align to second layer canvas edge
-			.."ffffGGG++G++"					-- second layer
-			.."GGfffff--G--"
-			.."ffffffG++G++"
-			.."fffffff--G--"
-			.."ffffffG++G++"
-			.."GGfffff--G--"
-			.."ffffGGG",
-	rules_c = "/",
-	trunk="default:acacia_tree",
-	leaves="default:acacia_leaves",
-	angle=45,
-	iterations=3,
-	random_level=0,
-	trunk_type="single",
-	thin_branches=true,
-}
-
 moretrees.rubber_tree_model={
 	axiom="FFFFA",
 	rules_a="[&FFBFA]////[&BFFFA]////[&FBFFA]",