From b28af2117d7d1104a05361d2271eb97e6637b17e Mon Sep 17 00:00:00 2001
From: tenplus1 <kinsellaja@yahoo.com>
Date: Mon, 8 Jul 2024 16:59:56 +0100
Subject: [PATCH] add missing place_param2 check and values

---
 wood.lua | 69 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 37 insertions(+), 32 deletions(-)

diff --git a/wood.lua b/wood.lua
index 5793060..d199708 100644
--- a/wood.lua
+++ b/wood.lua
@@ -1,8 +1,10 @@
 
 local S = ethereal.translate
 local wood_place = ethereal.wood_rotate and minetest.rotate_node
+local p2 = 0; if wood_place then p2 = nil end
+
+-- basandra
 
--- basandra wood
 minetest.register_node("ethereal:basandra_wood", {
 	description = S("Basandra Wood"),
 	tiles = {"ethereal_basandra_bush_wood.png"},
@@ -10,7 +12,8 @@ minetest.register_node("ethereal:basandra_wood", {
 	is_ground_content = false,
 	groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 1},
 	sounds = default.node_sound_wood_defaults(),
-	on_place = wood_place
+	on_place = wood_place,
+	place_param2 = p2
 })
 
 minetest.register_craft({
@@ -18,7 +21,8 @@ minetest.register_craft({
 	recipe = {{"ethereal:basandra_bush_stem"}}
 })
 
--- sakura trunk
+-- sakura
+
 minetest.register_node("ethereal:sakura_trunk", {
 	description = S("Sakura Trunk"),
 	tiles = {
@@ -32,7 +36,6 @@ minetest.register_node("ethereal:sakura_trunk", {
 	on_place = minetest.rotate_node
 })
 
--- sakura wood
 minetest.register_node("ethereal:sakura_wood", {
 	description = S("Sakura Wood"),
 	tiles = {"ethereal_sakura_wood.png"},
@@ -40,7 +43,8 @@ minetest.register_node("ethereal:sakura_wood", {
 	groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 3},
 	sounds = default.node_sound_wood_defaults(),
 	paramtype2 = "facedir",
-	on_place = wood_place
+	on_place = wood_place,
+	place_param2 = p2
 })
 
 minetest.register_craft({
@@ -48,8 +52,8 @@ minetest.register_craft({
 	recipe = {{"ethereal:sakura_trunk"}}
 })
 
+-- willow
 
--- willow trunk
 minetest.register_node("ethereal:willow_trunk", {
 	description = S("Willow Trunk"),
 	tiles = {
@@ -63,7 +67,6 @@ minetest.register_node("ethereal:willow_trunk", {
 	on_place = minetest.rotate_node
 })
 
--- willow wood
 minetest.register_node("ethereal:willow_wood", {
 	description = S("Willow Wood"),
 	tiles = {"ethereal_willow_wood.png"},
@@ -71,7 +74,8 @@ minetest.register_node("ethereal:willow_wood", {
 	groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 3},
 	sounds = default.node_sound_wood_defaults(),
 	paramtype2 = "facedir",
-	on_place = wood_place
+	on_place = wood_place,
+	place_param2 = p2
 })
 
 minetest.register_craft({
@@ -79,8 +83,8 @@ minetest.register_craft({
 	recipe = {{"ethereal:willow_trunk"}}
 })
 
+-- redwood
 
--- redwood trunk
 minetest.register_node("ethereal:redwood_trunk", {
 	description = S("Redwood Trunk"),
 	tiles = {
@@ -94,7 +98,6 @@ minetest.register_node("ethereal:redwood_trunk", {
 	on_place = minetest.rotate_node
 })
 
--- redwood wood
 minetest.register_node("ethereal:redwood_wood", {
 	description = S("Redwood Wood"),
 	tiles = {"ethereal_redwood_wood.png"},
@@ -102,7 +105,8 @@ minetest.register_node("ethereal:redwood_wood", {
 	groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 3},
 	sounds = default.node_sound_wood_defaults(),
 	paramtype2 = "facedir",
-	on_place = wood_place
+	on_place = wood_place,
+	place_param2 = p2
 })
 
 minetest.register_craft({
@@ -110,8 +114,8 @@ minetest.register_craft({
 	recipe = {{"ethereal:redwood_trunk"}}
 })
 
+-- frost
 
--- frost trunk
 minetest.register_node("ethereal:frost_tree", {
 	description = S("Frost Tree"),
 	tiles = {
@@ -125,7 +129,6 @@ minetest.register_node("ethereal:frost_tree", {
 	on_place = minetest.rotate_node
 })
 
--- frost wood
 minetest.register_node("ethereal:frost_wood", {
 	description = S("Frost Wood"),
 	tiles = {"ethereal_frost_wood.png"},
@@ -133,7 +136,8 @@ minetest.register_node("ethereal:frost_wood", {
 	groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 1},
 	sounds = default.node_sound_wood_defaults(),
 	paramtype2 = "facedir",
-	on_place = wood_place
+	on_place = wood_place,
+	place_param2 = p2
 })
 
 minetest.register_craft({
@@ -142,7 +146,8 @@ minetest.register_craft({
 })
 
 
--- healing trunk
+-- healing
+
 minetest.register_node("ethereal:yellow_trunk", {
 	description = S("Healing Tree Trunk"),
 	tiles = {
@@ -156,7 +161,6 @@ minetest.register_node("ethereal:yellow_trunk", {
 	on_place = minetest.rotate_node
 })
 
--- healing wood
 minetest.register_node("ethereal:yellow_wood", {
 	description = S("Healing Tree Wood"),
 	tiles = {"ethereal_yellow_wood.png"},
@@ -164,7 +168,8 @@ minetest.register_node("ethereal:yellow_wood", {
 	groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 1},
 	sounds = default.node_sound_wood_defaults(),
 	paramtype2 = "facedir",
-	on_place = wood_place
+	on_place = wood_place,
+	place_param2 = p2
 })
 
 minetest.register_craft({
@@ -172,8 +177,8 @@ minetest.register_craft({
 	recipe = {{"ethereal:yellow_trunk"}}
 })
 
+-- palm (thanks to VanessaE for palm textures)
 
--- palm trunk (thanks to VanessaE for palm textures)
 minetest.register_node("ethereal:palm_trunk", {
 	description = S("Palm Trunk"),
 	tiles = {
@@ -187,7 +192,6 @@ minetest.register_node("ethereal:palm_trunk", {
 	on_place = minetest.rotate_node
 })
 
--- palm wood
 minetest.register_node("ethereal:palm_wood", {
 	description = S("Palm Wood"),
 	tiles = {"moretrees_palm_wood.png"},
@@ -195,7 +199,8 @@ minetest.register_node("ethereal:palm_wood", {
 	groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 3},
 	sounds = default.node_sound_wood_defaults(),
 	paramtype2 = "facedir",
-	on_place = wood_place
+	on_place = wood_place,
+	place_param2 = p2
 })
 
 minetest.register_craft({
@@ -203,8 +208,8 @@ minetest.register_craft({
 	recipe = {{"ethereal:palm_trunk"}}
 })
 
+-- banana
 
--- banana trunk
 minetest.register_node("ethereal:banana_trunk", {
 	description = S("Banana Trunk"),
 	tiles = {
@@ -218,7 +223,6 @@ minetest.register_node("ethereal:banana_trunk", {
 	on_place = minetest.rotate_node
 })
 
--- banana wood
 minetest.register_node("ethereal:banana_wood", {
 	description = S("Banana Wood"),
 	tiles = {"ethereal_banana_wood.png"},
@@ -226,7 +230,8 @@ minetest.register_node("ethereal:banana_wood", {
 	groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 3},
 	sounds = default.node_sound_wood_defaults(),
 	paramtype2 = "facedir",
-	on_place = wood_place
+	on_place = wood_place,
+	place_param2 = p2
 })
 
 minetest.register_craft({
@@ -234,8 +239,8 @@ minetest.register_craft({
 	recipe = {{"ethereal:banana_trunk"}}
 })
 
+-- scorched
 
--- scorched trunk
 minetest.register_node("ethereal:scorched_tree", {
 	description = S("Scorched Tree"),
 	tiles = {
@@ -258,8 +263,8 @@ minetest.register_craft({
 	}
 })
 
+-- mushroom
 
--- mushroom trunk
 minetest.register_node("ethereal:mushroom_trunk", {
 	description = S("Mushroom"),
 	tiles = {
@@ -273,8 +278,8 @@ minetest.register_node("ethereal:mushroom_trunk", {
 	on_place = minetest.rotate_node
 })
 
+-- birch (thanks to VanessaE for birch textures)
 
--- birch trunk (thanks to VanessaE for birch textures)
 minetest.register_node("ethereal:birch_trunk", {
 	description = S("Birch Trunk"),
 	tiles = {
@@ -288,7 +293,6 @@ minetest.register_node("ethereal:birch_trunk", {
 	on_place = minetest.rotate_node
 })
 
--- birch wood
 minetest.register_node("ethereal:birch_wood", {
 	description = S("Birch Wood"),
 	tiles = {"moretrees_birch_wood.png"},
@@ -296,7 +300,8 @@ minetest.register_node("ethereal:birch_wood", {
 	groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 3},
 	sounds = default.node_sound_wood_defaults(),
 	paramtype2 = "facedir",
-	on_place = wood_place
+	on_place = wood_place,
+	place_param2 = p2
 })
 
 minetest.register_craft({
@@ -304,8 +309,8 @@ minetest.register_craft({
 	recipe = {{"ethereal:birch_trunk"}}
 })
 
-
 -- Bamboo
+
 minetest.register_node("ethereal:bamboo", {
 	description = S("Bamboo"),
 	drawtype = "plantlike",
@@ -337,8 +342,8 @@ minetest.register_craft({
 	burntime = 2
 })
 
+-- olive
 
--- olive trunk
 minetest.register_node("ethereal:olive_trunk", {
 	description = S("Olive Trunk"),
 	tiles = {
@@ -352,7 +357,6 @@ minetest.register_node("ethereal:olive_trunk", {
 	on_place = minetest.rotate_node
 })
 
--- olive wood
 minetest.register_node("ethereal:olive_wood", {
 	description = S("Olive Wood"),
 	tiles = {"ethereal_olive_wood.png"},
@@ -360,7 +364,8 @@ minetest.register_node("ethereal:olive_wood", {
 	groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 3},
 	sounds = default.node_sound_wood_defaults(),
 	paramtype2 = "facedir",
-	on_place = wood_place
+	on_place = wood_place,
+	place_param2 = p2
 })
 
 minetest.register_craft({