Forgot some references to the old jungletrees and conifers nodes

when I was weeding out the legacy names and textures.  This should fix
the last of it.

diff --git a/crafts.lua b/crafts.lua
index 3f24c01dc70f44db85bcc4300d34a439681d9d0a..0d18bbca89ef3edb9e36552a662e283c56422e94 100644 (file)
--- a/crafts.lua
+++ b/crafts.lua
@@ -66,31 +66,31 @@ minetest.register_craft({
 ----
 
 minetest.register_craft({
-       output = "conifers:trunk_reversed 2",
+       output = "moretrees:fir_trunk_sideways 2",
        recipe = {
-               {"conifers:trunk", "conifers:trunk"},
+               {"moretrees:fir_trunk", "fir:trunk"},
        }
 })
 
 minetest.register_craft({
-       output = "conifers:trunk 2",
+       output = "moretrees:fir_trunk 2",
        recipe = {
-               {"conifers:trunk_reversed"},
-               {"conifers:trunk_reversed"}
+               {"moretrees:fir_trunk_sideways"},
+               {"moretrees:fir_trunk_sideways"}
        }
 })
 
 minetest.register_craft({
        output = "default:wood 4",
        recipe = {
-               {"conifers:trunk"}
+               {"moretrees:fir_trunk"}
        }
 })
 
 minetest.register_craft({
        output = "default:wood 4",
        recipe = {
-               {"conifers:trunk_reversed"}
+               {"moretrees:fir_trunk_sideways"}
        }
 })
 

diff --git a/init.lua b/init.lua
index d2ffa5ae4e13bc373659235d296ee0c9c2838213..40a8dc27fd2db15199101fd84f46c59ade641af4 100644 (file)
--- a/init.lua
+++ b/init.lua
@@ -47,7 +47,7 @@ plantslib:register_generate_plant(moretrees.willow_biome, moretrees.willow_model
 plantslib:register_generate_plant(moretrees.birch_biome, "moretrees:grow_birch")
 plantslib:register_generate_plant(moretrees.spruce_biome, "moretrees:grow_spruce")
 plantslib:register_generate_plant(moretrees.jungletree_biome, "moretrees:grow_jungletree")
-plantslib:register_generate_plant(moretrees.conifer_biome, "moretrees:grow_conifer")
+plantslib:register_generate_plant(moretrees.conifer_biome, "moretrees:grow_fir")
 
 -- These three lines replace default trees with beech
 -- Enable them if you want but be warned - due to serious bugs in the speed
@@ -90,7 +90,7 @@ end
 
 plantslib:grow_plants(sapling_interval,sapling_chance,"moretrees:birch_sapling",nil,nil,nil,nil,nil,nil,nil,nil,"moretrees:grow_birch",nil)
 plantslib:grow_plants(sapling_interval,sapling_chance,"moretrees:spruce_sapling",nil,nil,nil,nil,nil,nil,nil,nil,"moretrees:grow_spruce",nil)
-plantslib:grow_plants(sapling_interval,sapling_chance,"moretrees:conifer_sapling",nil,nil,nil,nil,nil,nil,nil,nil,"moretrees:grow_conifer",nil)
+plantslib:grow_plants(sapling_interval,sapling_chance,"moretrees:conifer_sapling",nil,nil,nil,nil,nil,nil,nil,nil,"moretrees:grow_fir",nil)
 plantslib:grow_plants(sapling_interval,sapling_chance,"moretrees:jungletree_sapling",nil,nil,nil,nil,nil,nil,nil,nil,"moretrees:grow_jungletree",nil)
 
 -- Code to spawn a birch tree
@@ -135,9 +135,9 @@ function moretrees:grow_jungletree(pos)
        local r1 = math.random(2)
        local r2 = math.random(3)
        if r1 == 1 then
-               moretrees.jungletree_model.leaves2 = "jungletree:leaves_red"
+               moretrees.jungletree_model.leaves2 = "moretrees:jungletree_leaves_red"
        else 
-               moretrees.jungletree_model.leaves2 = "jungletree:leaves_yellow"
+               moretrees.jungletree_model.leaves2 = "moretrees:jungletree_leaves_yellow"
        end
        moretrees.jungletree_model.leaves2_chance = math.random(25, 75)
 
@@ -169,11 +169,11 @@ function moretrees:grow_jungletree(pos)
        minetest.env:spawn_tree(pos, moretrees.jungletree_model)
 end
 
-function moretrees:grow_conifer(pos)
+function moretrees:grow_fir(pos)
        if math.random(2) == 1 then
-               moretrees.conifer_model.leaves="conifers:leaves"
+               moretrees.conifer_model.leaves="moretrees:fir_leaves"
        else
-               moretrees.conifer_model.leaves="conifers:leaves_special"
+               moretrees.conifer_model.leaves="moretrees:fir_leaves_special"
        end
        if math.random(2) == 1 then
                moretrees.conifer_model.rules_a = moretrees.ct_rules_a1

diff --git a/node_defs.lua b/node_defs.lua
index d807f95f08001052ba53d1af4f40ff123bfb79fd..38ed95009dcb0be48073be894f653d5ed933ac52 100644 (file)
--- a/node_defs.lua
+++ b/node_defs.lua
@@ -18,9 +18,9 @@ table.insert(moretrees.avoidnodes, "moretrees:jungletree_trunk")
 table.insert(moretrees.avoidnodes, "moretrees:jungletree_leaves_red")
 table.insert(moretrees.avoidnodes, "moretrees:jungletree_leaves_green")
 table.insert(moretrees.avoidnodes, "moretrees:jungletree_leaves_yellow")
-table.insert(moretrees.avoidnodes, "moretrees:conifer_trunk")
-table.insert(moretrees.avoidnodes, "moretrees:conifer_leaves")
-table.insert(moretrees.avoidnodes, "moretrees:conifer_leaves_bright")
+table.insert(moretrees.avoidnodes, "moretrees:fir_trunk")
+table.insert(moretrees.avoidnodes, "moretrees:fir_leaves")
+table.insert(moretrees.avoidnodes, "moretrees:fir_leaves_bright")
 
 for i in ipairs(leaves) do
        local name = leaves[i]
@@ -205,17 +205,17 @@ for color = 1, 3 do
        })
 end
 
--- Nodes for conifers
+-- Nodes for firs
 
-minetest.register_node("moretrees:conifer_trunk", {
-       description = "Conifer trunk",
+minetest.register_node("moretrees:fir_trunk", {
+       description = "Fir trunk",
        tile_images = { 
-               "moretrees_conifer_trunktop.png", 
-               "moretrees_conifer_trunktop.png", 
-               "moretrees_conifer_trunk.png", 
-               "moretrees_conifer_trunk.png", 
-               "moretrees_conifer_trunk.png", 
-               "moretrees_conifer_trunk.png" 
+               "moretrees_fir_trunktop.png", 
+               "moretrees_fir_trunktop.png", 
+               "moretrees_fir_trunk.png", 
+               "moretrees_fir_trunk.png", 
+               "moretrees_fir_trunk.png", 
+               "moretrees_fir_trunk.png" 
        },
        is_ground_content = true,
        groups = {
@@ -229,21 +229,16 @@ minetest.register_node("moretrees:conifer_trunk", {
        sounds = default.node_sound_wood_defaults()
 })
 
-minetest.register_node("moretrees:conifer_trunk_sideways", {
-       description = "Conifer reversed trunk",
+minetest.register_node("moretrees:fir_trunk_sideways", {
+       description = "Fir Trunk (sideways)",
        tile_images = { 
-               "moretrees_conifer_trunk.png^[transformR90", 
-               "moretrees_conifer_trunk.png^[transformR90",
-               "moretrees_conifer_trunktop.png", 
-               "moretrees_conifer_trunktop.png", 
-               "moretrees_conifer_trunk.png^[transformR90", 
-               "moretrees_conifer_trunk.png^[transformR90" 
+               "moretrees_fir_trunk.png^[transformR90", 
+               "moretrees_fir_trunk.png^[transformR90",
+               "moretrees_fir_trunktop.png", 
+               "moretrees_fir_trunktop.png", 
+               "moretrees_fir_trunk.png^[transformR90", 
+               "moretrees_fir_trunk.png^[transformR90" 
        },
-       --inventory_image = minetest.inventorycube(
-               --"conifers_trunk.png",
-               --"conifers_trunktop.png",
-               --"conifers_trunk.png"
-       --),
        paramtype2 = "facedir",
        material = minetest.digprop_woodlike(1.0),
 
@@ -258,10 +253,10 @@ minetest.register_node("moretrees:conifer_trunk_sideways", {
        sounds = default.node_sound_wood_defaults()
 })
 
-minetest.register_node("moretrees:conifer_leaves", {
+minetest.register_node("moretrees:fir_leaves", {
        drawtype = "allfaces_optional",
-       description = "Conifer leaves",
-       tile_images = { "moretrees_conifer_leaves.png" },
+       description = "Fir Leaves",
+       tile_images = { "moretrees_fir_leaves.png" },
        paramtype = "light",
        groups = {
                snappy = 3,
@@ -273,23 +268,23 @@ minetest.register_node("moretrees:conifer_leaves", {
                items = {
                        {
                                -- player will get sapling with 1/20 chance
-                               items = {'conifers:sapling'},
+                               items = {'moretrees:fir_sapling'},
                                rarity = 20,
                        },
                        {
                                -- player will get leaves only if he get no saplings,
                                -- this is because max_items is 1
-                               items = {'conifers:leaves'},
+                               items = {'moretrees:fir_leaves'},
                        }
                }
        },
        sounds = default.node_sound_leaves_defaults()
 })
 
-minetest.register_node("moretrees:conifer_leaves_bright", {
+minetest.register_node("moretrees:fir_leaves_bright", {
        drawtype = "allfaces_optional",
-       description = "Bright conifer leaves",
-       tile_images = { "moretrees_conifer_leaves_bright.png" },
+       description = "Fir Leaves (Bright)",
+       tile_images = { "moretrees_fir_leaves_bright.png" },
        paramtype = "light",
 
        groups = {
@@ -302,23 +297,23 @@ minetest.register_node("moretrees:conifer_leaves_bright", {
                items = {
                        {
                                -- player will get sapling with 1/20 chance
-                               items = {'conifers:sapling'},
+                               items = {'moretrees:fir_sapling'},
                                rarity = 20,
                        },
                        {
                                -- player will get leaves only if he get no saplings,
                                -- this is because max_items is 1
-                               items = {'conifers:leaves'},
+                               items = {'moretrees:fir_leaves'},
                        }
                }
        },
        sounds = default.node_sound_leaves_defaults()
 })
 
-minetest.register_node("moretrees:conifer_sapling", {
-       description = "Conifer sapling",
+minetest.register_node("moretrees:fir_sapling", {
+       description = "Fir sapling",
        drawtype = "plantlike",
-       tile_images = {"moretrees_conifer_sapling.png"},
+       tile_images = {"moretrees_fir_sapling.png"},
        paramtype = "light",
        walkable = false,
        groups = {
@@ -338,9 +333,15 @@ minetest.register_alias("jungletree:leaves_green", "moretrees:jungletree_leaves_
 minetest.register_alias("jungletree:leaves_red", "moretrees:jungletree_leaves_red")
 minetest.register_alias("jungletree:leaves_yellow", "moretrees:jungletree_leaves_yellow")
 
-minetest.register_alias("conifers:trunk", "moretrees:conifer_trunk")
-minetest.register_alias("conifers:trunk_reversed", "moretrees:conifer_trunk_sideways")
-minetest.register_alias("conifers:leaves", "moretrees:conifer_leaves")
-minetest.register_alias("conifers:leaves_special", "moretrees:conifer_leaves_bright")
-minetest.register_alias("conifers:sapling", "moretrees:conifer_sapling")
+minetest.register_alias("moretrees:conifer_trunk", "moretrees:fir_trunk")
+minetest.register_alias("moretrees:conifer_trunk_sideways", "moretrees:fir_trunk_sideways")
+minetest.register_alias("moretrees:conifer_leaves", "moretrees:fir_leaves")
+minetest.register_alias("moretrees:conifer_leaves_bright", "moretrees:fir_leaves_bright")
+minetest.register_alias("moretrees:conifer_sapling", "moretrees:fir_sapling")
+
+minetest.register_alias("conifers:trunk", "moretrees:fir_trunk")
+minetest.register_alias("conifers:trunk_reversed", "moretrees:fir_trunk_sideways")
+minetest.register_alias("conifers:leaves", "moretrees:fir_leaves")
+minetest.register_alias("conifers:leaves_special", "moretrees:fir_leaves_bright")
+minetest.register_alias("conifers:sapling", "moretrees:fir_sapling")
 

diff --git a/textures/moretrees_conifer_leaves.png b/textures/moretrees_conifer_leaves.png
deleted file mode 100644 (file)
index cfaaa1c..0000000
Binary files a/textures/moretrees_conifer_leaves.png and /dev/null differ

diff --git a/textures/moretrees_conifer_leaves_bright.png b/textures/moretrees_conifer_leaves_bright.png
deleted file mode 100644 (file)
index c5dca1c..0000000
Binary files a/textures/moretrees_conifer_leaves_bright.png and /dev/null differ

diff --git a/textures/moretrees_conifer_sapling.png b/textures/moretrees_conifer_sapling.png
deleted file mode 100644 (file)
index bcbed08..0000000
Binary files a/textures/moretrees_conifer_sapling.png and /dev/null differ

diff --git a/textures/moretrees_conifer_trunk.png b/textures/moretrees_conifer_trunk.png
deleted file mode 100644 (file)
index 6e4e67a..0000000
Binary files a/textures/moretrees_conifer_trunk.png and /dev/null differ

diff --git a/textures/moretrees_conifer_trunk_reversed.png b/textures/moretrees_conifer_trunk_reversed.png
deleted file mode 100644 (file)
index 0730e31..0000000
Binary files a/textures/moretrees_conifer_trunk_reversed.png and /dev/null differ

diff --git a/textures/moretrees_conifer_trunktop.png b/textures/moretrees_conifer_trunktop.png
deleted file mode 100644 (file)
index 4f21401..0000000
Binary files a/textures/moretrees_conifer_trunktop.png and /dev/null differ

diff --git a/textures/moretrees_fir_leaves.png b/textures/moretrees_fir_leaves.png
new file mode 100644 (file)
index 0000000..cfaaa1c
Binary files /dev/null and b/textures/moretrees_fir_leaves.png differ

diff --git a/textures/moretrees_fir_leaves_bright.png b/textures/moretrees_fir_leaves_bright.png
new file mode 100644 (file)
index 0000000..c5dca1c
Binary files /dev/null and b/textures/moretrees_fir_leaves_bright.png differ

diff --git a/textures/moretrees_fir_sapling.png b/textures/moretrees_fir_sapling.png
new file mode 100644 (file)
index 0000000..bcbed08
Binary files /dev/null and b/textures/moretrees_fir_sapling.png differ

diff --git a/textures/moretrees_fir_trunk.png b/textures/moretrees_fir_trunk.png
new file mode 100644 (file)
index 0000000..6e4e67a
Binary files /dev/null and b/textures/moretrees_fir_trunk.png differ

diff --git a/textures/moretrees_fir_trunk_reversed.png b/textures/moretrees_fir_trunk_reversed.png
new file mode 100644 (file)
index 0000000..0730e31
Binary files /dev/null and b/textures/moretrees_fir_trunk_reversed.png differ

diff --git a/textures/moretrees_fir_trunktop.png b/textures/moretrees_fir_trunktop.png
new file mode 100644 (file)
index 0000000..4f21401
Binary files /dev/null and b/textures/moretrees_fir_trunktop.png differ

diff --git a/tree_models.lua b/tree_models.lua
index 2288379228e0e47dd3493a4e682918ac367999e8..a355a0d91924ca3625f6b7d258687f6e62a85623 100644 (file)
--- a/tree_models.lua
+++ b/tree_models.lua
@@ -186,8 +186,8 @@ moretrees.jungletree_model={
        axiom=nil,
        rules_a=nil,
        rules_b=nil,
-       trunk="default:jungletree",
-       leaves="jungletree:leaves_green",
+       trunk="moretrees:jungletree_trunk",
+       leaves="moretrees:jungletree_leaves_green",
        leaves2=nil,
        leaves2_chance=nil,
        angle=45,
@@ -203,7 +203,7 @@ moretrees.conifer_model={
        axiom="FFFAF[&&-F][&&+F][&&---F][&&+++F]Fff",
        rules_a=nil,
        rules_b=nil,
-       trunk="conifers:trunk",
+       trunk="moretrees:fir_trunk",
        leaves=nil,
        angle=45,
        iterations=7,