removed all code that tries to disable default trees because the minetest dev

team is being completely obstinant about letting me properly disable them from
this mod.

Instead, made beech trees respond to enable flags in settings.lua (disabled by
default).  If you want beeches, turn that flag on in settings.lua and remove
the "trees" flag from yourworld/map_meta.txt in the mg_flags line.

diff --git a/biome_defs.lua b/biome_defs.lua
index b92c2d652790d68012ca842fd7e0822fa59c81a2..323433ce133427e154e4db0bb2c258307642b7b9 100644 (file)
--- a/biome_defs.lua
+++ b/biome_defs.lua
@@ -2,10 +2,10 @@
 moretrees.beech_biome = {
        surface = "default:dirt_with_grass",
        avoid_nodes = moretrees.avoidnodes,
-       avoid_radius = 10,
+       avoid_radius = 8,
        seed_diff = 2,
        rarity = 50,
-       max_count = 15,
+       max_count = 20,
 }
 
 moretrees.palm_biome = {

diff --git a/init.lua b/init.lua
index 90e811179a3990ddc4020c092c0bc0f7d3619796..6773e41fe4e448c893079dcb0647c16e039a7d3f 100644 (file)
--- a/init.lua
+++ b/init.lua
@@ -19,22 +19,19 @@
 moretrees = {}
 
 dofile(minetest.get_modpath("moretrees").."/settings.lua")
-dofile(minetest.get_modpath("moretrees").."/node_defs.lua")
 dofile(minetest.get_modpath("moretrees").."/tree_models.lua")
 dofile(minetest.get_modpath("moretrees").."/biome_defs.lua")
+dofile(minetest.get_modpath("moretrees").."/node_defs.lua")
+dofile(minetest.get_modpath("moretrees").."/saplings.lua")
 dofile(minetest.get_modpath("moretrees").."/crafts.lua")
 dofile(minetest.get_modpath("moretrees").."/leafdecay.lua")
-dofile(minetest.get_modpath("moretrees").."/saplings.lua")
 
-if moretrees.enable_replace_default_trees then
-       minetest.register_alias("mapgen_tree",   "air")
-       minetest.register_alias("mapgen_leaves", "air")
-       minetest.register_alias("mapgen_apple",  "air")
+-- tree spawning setup
+
+if moretrees.enable_beech then
        plantslib:register_generate_plant(moretrees.beech_biome, moretrees.beech_model)
 end
 
--- tree spawning setup
-
 if moretrees.enable_apple_tree then
        plantslib:register_generate_plant(moretrees.apple_tree_biome, moretrees.apple_tree_model)
 end

diff --git a/node_defs.lua b/node_defs.lua
index a56795d0683c3ad9c4d1354515b0c86209d75fa6..bc594a8c4c419fd60b21aed557b095c7a4adaab1 100644 (file)
--- a/node_defs.lua
+++ b/node_defs.lua
@@ -1,6 +1,7 @@
 moretrees.avoidnodes = {}
        
 moretrees.treelist = {
+       {"beech",       "Beech Tree"},
        {"apple_tree",  "Apple Tree"},
        {"oak",         "Oak Tree",             "acorn",        "Acorn",        {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 },
        {"sequoia",     "Giant Sequoia"},
@@ -200,92 +201,13 @@ if moretrees.enable_redefine_apple then
        })
 end
 
-if moretrees.enable_replace_default_trees then
-
-       minetest.register_node(":default:tree", {
-               description = "Beech Trunk",
-               tiles = {"moretrees_beech_trunk_top.png", "moretrees_beech_trunk_top.png", "moretrees_beech_trunk.png"},
-               groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,flammable=2},
-               sounds = default.node_sound_wood_defaults(),
-       })
-
-       minetest.register_node(":default:leaves", {
-               description = "Beech Leaves",
-               drawtype = "allfaces_optional",
-               visual_scale = 1.3,
-               tiles = {"moretrees_beech_leaves.png"},
-               paramtype = "light",
-               groups = {snappy=3, leafdecay=3, flammable=2, leaves=1},
-               drop = {
-                       max_items = 1,
-                       items = {
-                               {
-                                       -- player will get sapling with 1/20 chance
-                                       items = {'default:sapling'},
-                                       rarity = 20,
-                               },
-                               {
-                                       -- player will get leaves only if he get no saplings,
-                                       -- this is because max_items is 1
-                                       items = {'default:leaves'},
-                               }
-                       }
-               },
-               sounds = default.node_sound_leaves_defaults(),
-       })
-
-       minetest.register_node(":default:wood", {
-               description = "Beech Planks",
-               tiles = {"moretrees_beech_wood.png"},
-               groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
-               sounds = default.node_sound_wood_defaults(),
-       })
-
-       minetest.register_node(":default:sapling", {
-               description = "Beech Sapling",
-               drawtype = "plantlike",
-               visual_scale = 1.0,
-               tiles = {"moretrees_beech_sapling.png"},
-               inventory_image = "moretrees_beech_sapling.png",
-               wield_image = "moretrees_beech_sapling.png",
-               paramtype = "light",
-               walkable = false,
-               selection_box = {
-                       type = "fixed",
-                       fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
-               },
-               groups = {snappy=2,dig_immediate=3,flammable=2,attached_node=1},
-               sounds = default.node_sound_defaults(),
-       })
-end
-
-minetest.register_node("moretrees:beech_trunk_sideways", {
-       description = "Sideways Beech Trunk",
-       tiles = {
-               "moretrees_beech_trunk.png^[transformR90",
-               "moretrees_beech_trunk.png^[transformR90",
-               "moretrees_beech_trunk_top.png",
-               "moretrees_beech_trunk_top.png",
-               "moretrees_beech_trunk.png^[transformR90",
-               "moretrees_beech_trunk.png^[transformR90"
-       },
-       is_ground_content = true,
-       groups = {tree=1,snappy=1,choppy=2,oddly_breakable_by_hand=1,flammable=2},
-       sounds = default.node_sound_wood_defaults(),
-       paramtype2 = "facedir",
-})
-
 table.insert(moretrees.avoidnodes, "default:jungletree")
 table.insert(moretrees.avoidnodes, "moretrees:jungletree_trunk")
 table.insert(moretrees.avoidnodes, "moretrees:fir_trunk")
+table.insert(moretrees.avoidnodes, "default:tree")
 
 -- For compatibility with old nodes and recently-changed nodes.
 
-minetest.register_alias("moretrees:beech_trunk",  "default:tree")
-minetest.register_alias("moretrees:beech_leaves", "default:leaves")
-minetest.register_alias("moretrees:beech_planks", "default:wood")
-minetest.register_alias("moretrees:beech_sapling", "default:sapling") 
-
 minetest.register_alias("moretrees:jungletree_trunk", "default:jungletree")
 minetest.register_alias("moretrees:jungletree_planks", "default:junglewood")
 minetest.register_alias("moretrees:jungletree_sapling", "default:junglesapling")

diff --git a/settings.lua b/settings.lua
index 66fefeb63acd79ad09c0c0a0aa959cebda66d2c5..766d1933598853bc21536dfc4c51f61bb99f2c4f 100644 (file)
--- a/settings.lua
+++ b/settings.lua
@@ -13,13 +13,7 @@ moretrees.enable_birch               = true
 moretrees.enable_spruce                = true
 moretrees.enable_jungle_tree   = true
 moretrees.enable_fir           = true
-
--- Enable replacement of default trees with moretrees beech.
--- Note:  The code that uses this variable is in leafdecay.lua
--- because of how it interacts with settings related to that
--- function.
-
-moretrees.enable_replace_default_trees = true
+moretrees.enable_beech         = false
 
 -- Set this to true to enable leaf decay of all trees except the default ones.