add all the trees \0oO/

Author: TheThanathor

gm4_towering_trees/data/gm4_towering_trees/function/generate_small_tree.mcfunction

@@ -3,8 +3,10 @@
 # located at @s
 # run from generate_tree
 
-# mark sapling and clear the space
-function gm4_towering_trees:mark_sapling
+# remove sapling to clear the space
+execute if block ~ ~ ~ mangrove_propagule[waterlogged=true] run tag @s add gm4_mangrove_tree_sapling.waterlogged
+execute unless entity @s[tag=gm4_mangrove_tree_sapling.waterlogged] run fill ~ ~ ~ ~ ~ ~ air replace #gm4_towering_trees:supported_sapling
+execute if entity @s[tag=gm4_mangrove_tree_sapling.waterlogged] run setblock ~ ~ ~ water
 
 # vanilla
 execute if entity @s[tag=gm4_oak_tree_sapling] store success score $tree_placed gm4_towering_trees_data run place feature minecraft:oak
@@ -14,5 +16,16 @@ execute if entity @s[tag=gm4_mangrove_tree_sapling] store success score $tree_pl
 execute if entity @s[tag=gm4_birch_tree_sapling] store success score $tree_placed gm4_towering_trees_data run place feature minecraft:birch
 
 # towering
-execute if entity @s[tag=gm4_pale_oak_tree_sapling] store success score $tree_placed gm4_towering_trees_data run place feature minecraft:fancy_oak
-execute if entity @s[tag=gm4_dark_oak_tree_sapling] store success score $tree_placed gm4_towering_trees_data run place feature minecraft:fancy_oak
+execute if entity @s[tag=gm4_pale_oak_tree_sapling] store success score $tree_placed gm4_towering_trees_data run function gm4_towering_trees:generate_tree_type/pale_oak/pick_variant
+execute if entity @s[tag=gm4_dark_oak_tree_sapling] store success score $tree_placed gm4_towering_trees_data run function gm4_towering_trees:generate_tree_type/dark_oak/pick_variant
+
+# replace sapling if placement failed
+execute if score $tree_placed gm4_towering_trees_data matches 1 run return 1
+execute if entity @s[tag=gm4_oak_tree_sapling] run setblock ~ ~ ~ oak_sapling[stage=0]
+execute if entity @s[tag=gm4_acacia_tree_sapling] run setblock ~ ~ ~ acacia_sapling[stage=0]
+execute if entity @s[tag=gm4_cherry_tree_sapling] run setblock ~ ~ ~ cherry_sapling[stage=0]
+execute if entity @s[tag=gm4_mangrove_tree_sapling.waterlogged] run setblock ~ ~ ~ mangrove_propagule[stage=0,age=4,waterlogged=true]
+execute if entity @s[tag=!gm4_mangrove_tree_sapling.waterlogged,tag=!gm4_mangrove_tree_sapling] run setblock ~ ~ ~ mangrove_propagule[stage=0,age=4,waterlogged=false]
+execute if entity @s[tag=gm4_birch_tree_sapling] run setblock ~ ~ ~ birch_sapling[stage=0]
+execute if entity @s[tag=gm4_pale_oak_tree_sapling] run setblock ~ ~ ~ pale_oak_sapling[stage=0]
+execute if entity @s[tag=gm4_dark_oak_tree_sapling] run setblock ~ ~ ~ dark_oak_sapling[stage=0]

gm4_towering_trees/data/gm4_towering_trees/function/generate_tree_type/mangrove/extra.mcfunction

@@ -1,3 +1,6 @@
 
-fill ~ ~ ~ ~1 ~ ~1 air replace mangrove_propagule
+execute store success score $waterlogged gm4_towering_trees_data if block ~ ~ ~ mangrove_propagule[waterlogged=true]
+
+execute if score $waterlogged gm4_towering_trees_data matches 0 run fill ~ ~ ~ ~1 ~ ~1 air replace mangrove_propagule
+execute if score $waterlogged gm4_towering_trees_data matches 1 run fill ~ ~ ~ ~1 ~ ~1 water replace mangrove_propagule
 schedule function gm4_towering_trees:generate_tree_type/mangrove/roots/schedule 1t

gm4_towering_trees/data/gm4_towering_trees/function/generate_tree_type/mangrove/roots/loop.mcfunction

@@ -6,7 +6,8 @@ execute unless score $max_length gm4_towering_trees_data matches 1.. run return
 
 # fill with (muddy) roots
 fill ~ ~ ~ ~ ~ ~ muddy_mangrove_roots replace mud
-execute unless block ~ ~ ~ muddy_mangrove_roots run setblock ~ ~ ~ mangrove_roots
+execute if score $waterlogged gm4_towering_trees_data matches 0 unless block ~ ~ ~ muddy_mangrove_roots run setblock ~ ~ ~ mangrove_roots
+execute if score $waterlogged gm4_towering_trees_data matches 1 unless block ~ ~ ~ muddy_mangrove_roots run setblock ~ ~ ~ mangrove_roots[waterlogged=true]
 
 # random carpets
 execute if predicate {condition:"random_chance",chance:0.5} run fill ~ ~1 ~ ~ ~1 ~ moss_carpet replace #air

gm4_towering_trees/data/gm4_towering_trees/function/generate_tree_type/mangrove/roots/loop_to_ground.mcfunction

@@ -6,7 +6,8 @@ execute unless score $max_skew_length gm4_towering_trees_data matches 1.. run re
 
 # fill with (muddy) roots
 fill ~ ~ ~ ~ ~ ~ muddy_mangrove_roots replace mud
-execute unless block ~ ~ ~ muddy_mangrove_roots run setblock ~ ~ ~ mangrove_roots
+execute if score $waterlogged gm4_towering_trees_data matches 0 unless block ~ ~ ~ muddy_mangrove_roots run setblock ~ ~ ~ mangrove_roots
+execute if score $waterlogged gm4_towering_trees_data matches 1 unless block ~ ~ ~ muddy_mangrove_roots run setblock ~ ~ ~ mangrove_roots[waterlogged=true]
 
 # go down to ground
 execute positioned ~ ~-1 ~ run function gm4_towering_trees:generate_tree_type/mangrove/roots/loop_to_ground