Fix pale oak not working with Arborenda Shamir 1.21.4 (#1149)

* Fix pale oak not working with Arborenda Shamir

* Change to if items

* Pale oak should be required false on this branch for new tag

* Fix indentation

Author: runcows

gm4_metallurgy/data/gm4_arborenda_shamir/function/player/check_block_drop.mcfunction

@@ -5,7 +5,8 @@
 
 # place marker on first trunk block
 scoreboard players set $success gm4_arb_data 0
-execute as @e[type=item,limit=1,distance=..5,sort=nearest,nbt={Age:0s}] at @s run function gm4_arborenda_shamir:player/check_block_drop
+execute as @e[type=item,limit=1,distance=..5,sort=nearest,nbt={Age:0s}] at @s store success score $success gm4_arb_data \
+  if items entity @s container.* #gm4_arborenda_shamir:trunks align xyz run summon marker ~0.5 ~0.5 ~0.5 {Tags:[gm4_arborenda_trunk_source,gm4_arborenda_trunk,gm4_arborenda_init]}
 
 # identify axe (used for enchantment support)
 execute if score $success gm4_arb_data matches 1 run function gm4_arborenda_shamir:player/analyze_axe

gm4_metallurgy/data/gm4_arborenda_shamir/function/player/chop.mcfunction

@@ -0,0 +1,27 @@
+{
+	"values": [
+		"minecraft:acacia_log",
+		"minecraft:acacia_wood",
+		"minecraft:birch_log",
+		"minecraft:birch_wood",
+		"minecraft:cherry_log",
+		"minecraft:cherry_wood",
+		"minecraft:crimson_stem",
+		"minecraft:crimson_hyphae",
+		"minecraft:dark_oak_log",
+		"minecraft:dark_oak_wood",
+		"minecraft:jungle_log",
+		"minecraft:jungle_wood",
+		"minecraft:mangrove_log",
+		"minecraft:mangrove_roots",
+		"minecraft:mangrove_wood",
+		"minecraft:oak_log",
+		"minecraft:oak_wood",
+		{ "id": "minecraft:pale_oak_log", "required": false },
+		{ "id": "minecraft:pale_oak_wood", "required": false },
+		"minecraft:spruce_log",
+		"minecraft:spruce_wood",
+		"minecraft:warped_stem",
+		"minecraft:warped_hyphae"
+	]
+}