From c36b359c702c88b38a25d9628ed1bf6351704867 Mon Sep 17 00:00:00 2001
From: cora <coradelamouche@gmx.ch>
Date: Wed, 3 Aug 2022 00:00:13 +0200
Subject: [PATCH] Fix mangrove roots and water logged roots(somewhat)

---
 mods/ITEMS/mcl_mangrove/init.lua        | 23 ++++++-------
 mods/ITEMS/mcl_mangrove/models/node.obj | 46 -------------------------
 2 files changed, 11 insertions(+), 58 deletions(-)
 delete mode 100644 mods/ITEMS/mcl_mangrove/models/node.obj

diff --git a/mods/ITEMS/mcl_mangrove/init.lua b/mods/ITEMS/mcl_mangrove/init.lua
index f33c0106e..6b49fa577 100644
--- a/mods/ITEMS/mcl_mangrove/init.lua
+++ b/mods/ITEMS/mcl_mangrove/init.lua
@@ -47,7 +47,7 @@ end
 
 minetest.register_node("mcl_mangrove:mangrove_tree", {
 	description = S("Mangrove Wood"),
-	_doc_items_longdesc = S("The trunk of an Mangrove tree."),
+	_doc_items_longdesc = S("The trunk of a Mangrove tree."),
 	_doc_items_hidden = false,
 	tiles = {"mcl_mangrove_log_top.png", "mcl_mangrove_log_top.png", "mcl_mangrove_log.png"},
 	paramtype2 = "facedir",
@@ -57,10 +57,11 @@ minetest.register_node("mcl_mangrove:mangrove_tree", {
 	on_place = mcl_util.rotate_axis,
 	_mcl_blast_resistance = 2,
 	_mcl_hardness = 2,
+	_mcl_stripped_variant = "mcl_mangrove:mangrove_stripped_trunk",
 })
 minetest.register_node("mcl_mangrove:mangrove_tree_bark", {
 	description = S("Mangrove Bark"),
-	_doc_items_longdesc = S("The bark of an Mangrove tree."),
+	_doc_items_longdesc = S("The bark of a Mangrove tree."),
 	_doc_items_hidden = false,
 	tiles = {"mcl_mangrove_log.png", "mcl_mangrove_log.png", "mcl_mangrove_log.png"},
 	paramtype2 = "facedir",
@@ -137,14 +138,12 @@ minetest.register_node("mcl_mangrove:mangrove_roots", {
 	waving = 0,
 	place_param2 = 1, -- Prevent leafdecay for placed nodes
 	tiles = {
-		"mcl_mangrove_roots_top.png", "mcl_mangrove_roots_top.png",
-		"mcl_mangrove_roots_side.png", "mcl_mangrove_roots_side.png",
-		"mcl_mangrove_roots_side.png", "mcl_mangrove_roots_side.png"
+		"mcl_mangrove_roots_top.png",
+		"mcl_mangrove_roots_side.png",
+		"mcl_mangrove_roots_side.png",
 	},
 	paramtype = "light",
-
-	drawtype = "mesh",
-	mesh = "node.obj",
+	drawtype = "allfaces_optional",
 	groups = {
 		handy = 1, hoey = 1, shearsy = 1, axey = 1, swordy = 1, dig_by_piston = 0,
 		leaves = 1, deco_block = 1,flammable = 10, fire_encouragement = 30, fire_flammability = 60,	compostability = 30
@@ -175,7 +174,6 @@ minetest.register_node("mcl_mangrove:propagule", {
 		type = "fixed",
 		fixed = {-5/16, -0.5, -5/16, 5/16, 0.5, 5/16}
 	},
-
 	groups = {
 		plant = 1, sapling = 1, non_mycelium_plant = 1, attached_node = 1,
 		deco_block = 1, dig_immediate = 3, dig_by_water = 0, dig_by_piston = 1,
@@ -284,8 +282,8 @@ mcl_flowerpots.register_potted_flower("mcl_mangrove:propagule", {
 local water_tex = "default_water_source_animated.png^[verticalframe:16:0"
 
 local wlroots = {
-	description = ("water_logged_mangrove_roots"),
-	_doc_items_entry_name = S("water_logged_roots"),
+	description = ("water logged mangrove roots"),
+	_doc_items_entry_name = S("water logged mangrove roots"),
 	_doc_items_longdesc =
 		("Mangrove roots are decorative blocks that form as part of mangrove trees.").."\n\n"..
 		("Mangrove roots, despite being a full block, can be waterlogged and do not flow water out").."\n\n"..
@@ -308,7 +306,8 @@ local wlroots = {
 		"mcl_mangrove_roots_side.png",
 	},
 	sounds = mcl_sounds.node_sound_water_defaults(),
-	use_texture_alpha = "blend",
+	drawtype = "allfaces_optional",
+	use_texture_alpha = "clip",
 	is_ground_content = false,
 	paramtype = "light",
 	walkable = true,
diff --git a/mods/ITEMS/mcl_mangrove/models/node.obj b/mods/ITEMS/mcl_mangrove/models/node.obj
deleted file mode 100644
index bb50e2495..000000000
--- a/mods/ITEMS/mcl_mangrove/models/node.obj
+++ /dev/null
@@ -1,46 +0,0 @@
-# Blender v3.1.2 OBJ File: 'minetest_base_node.blend'
-# www.blender.org
-mtllib roots_base_node.mtl
-o node
-v -0.500000 0.500000 0.500000
-v 0.500000 0.500000 0.500000
-v 0.500000 0.500000 -0.500000
-v -0.500000 0.500000 -0.500000
-v -0.500000 -0.500000 -0.500000
-v 0.500000 -0.500000 -0.500000
-v 0.500000 -0.500000 0.500000
-v -0.500000 -0.500000 0.500000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vt 1.000000 1.000000
-vt 0.000000 1.000000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vt 1.000000 1.000000
-vt 0.000000 1.000000
-vt 0.000000 0.000000
-vt 0.000000 1.000000
-vt 1.000000 0.000000
-vt 1.000000 1.000000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vt 1.000000 1.000000
-vt 0.000000 1.000000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vt 1.000000 1.000000
-vt 0.000000 1.000000
-vn 0.0000 1.0000 0.0000
-vn 0.0000 -1.0000 -0.0000
-vn 1.0000 -0.0000 0.0000
-vn -1.0000 0.0000 0.0000
-vn 0.0000 0.0000 -1.0000
-vn 0.0000 -0.0000 1.0000
-usemtl Material
-s 1
-f 1/1/1 2/2/1 3/3/1 4/4/1
-f 5/5/2 6/6/2 7/7/2 8/8/2
-f 7/9/3 6/6/3 3/3/3 2/10/3
-f 5/5/4 8/11/4 1/12/4 4/4/4
-f 6/13/5 5/14/5 4/15/5 3/16/5
-f 8/17/6 7/18/6 2/19/6 1/20/6