don't define acacia and pine nodes - alias them to the default ones instead

11 files changed, 12 insertions, 1 deletions

diff --git a/node_defs.lua b/node_defs.lua
index cad3a07..724133f 100644
--- a/node_defs.lua
+++ b/node_defs.lua
@@ -76,7 +76,9 @@ for i in ipairs(moretrees.treelist) do
 	local selbox = moretrees.treelist[i][5]
 	local vscale = moretrees.treelist[i][6]
 
-	if treename ~= "jungletree" then -- the default game provides jungle tree trunk/planks nodes.
+	if treename ~= "jungletree"  -- the default game provides jungle tree, acacia, and pine trunk/planks nodes.
+		and treename ~= "acacia"
+		and treename ~= "pine" then
 
 		minetest.register_node("moretrees:"..treename.."_trunk", {
 			description = S(treedesc.." Trunk"),
@@ -451,3 +453,12 @@ 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")
 
+minetest.register_alias("moretrees:acacia_trunk", "default:acacia_tree")
+minetest.register_alias("moretrees:acacia_planks", "default:acacia_wood")
+minetest.register_alias("moretrees:acacia_sapling", "default:acacia_sapling")
+minetest.register_alias("moretrees:acacia_leaves", "default:acacia_leaves")
+
+minetest.register_alias("moretrees:pine_trunk", "default:pinetree")
+minetest.register_alias("moretrees:pine_planks", "default:pinewood")
+minetest.register_alias("moretrees:pine_sapling", "default:pine_sapling")
+minetest.register_alias("moretrees:pine_leaves", "default:pine_needles")
diff --git a/textures/moretrees_acacia_leaves.png b/textures/moretrees_acacia_leaves.png
deleted file mode 100644
index 73a8951..0000000
--- a/textures/moretrees_acacia_leaves.png
+++ /dev/null
diff --git a/textures/moretrees_acacia_sapling.png b/textures/moretrees_acacia_sapling.png
deleted file mode 100644
index 5767f64..0000000
--- a/textures/moretrees_acacia_sapling.png
+++ /dev/null
diff --git a/textures/moretrees_acacia_trunk.png b/textures/moretrees_acacia_trunk.png
deleted file mode 100644
index 7e60995..0000000
--- a/textures/moretrees_acacia_trunk.png
+++ /dev/null
diff --git a/textures/moretrees_acacia_trunk_top.png b/textures/moretrees_acacia_trunk_top.png
deleted file mode 100644
index 858a8a8..0000000
--- a/textures/moretrees_acacia_trunk_top.png
+++ /dev/null
diff --git a/textures/moretrees_acacia_wood.png b/textures/moretrees_acacia_wood.png
deleted file mode 100644
index 98c4038..0000000
--- a/textures/moretrees_acacia_wood.png
+++ /dev/null
diff --git a/textures/moretrees_pine_leaves.png b/textures/moretrees_pine_leaves.png
deleted file mode 100644
index e6de482..0000000
--- a/textures/moretrees_pine_leaves.png
+++ /dev/null
diff --git a/textures/moretrees_pine_sapling.png b/textures/moretrees_pine_sapling.png
deleted file mode 100644
index 42f8ecc..0000000
--- a/textures/moretrees_pine_sapling.png
+++ /dev/null
diff --git a/textures/moretrees_pine_trunk.png b/textures/moretrees_pine_trunk.png
deleted file mode 100644
index ea685e3..0000000
--- a/textures/moretrees_pine_trunk.png
+++ /dev/null
diff --git a/textures/moretrees_pine_trunk_top.png b/textures/moretrees_pine_trunk_top.png
deleted file mode 100644
index 01aed1d..0000000
--- a/textures/moretrees_pine_trunk_top.png
+++ /dev/null
diff --git a/textures/moretrees_pine_wood.png b/textures/moretrees_pine_wood.png
deleted file mode 100644
index 8680bd5..0000000
--- a/textures/moretrees_pine_wood.png
+++ /dev/null