use predicate to check blocks

Author: BPR02

gm4_apple_trees/beet.yaml

@@ -2,6 +2,9 @@ id: gm4_apple_trees
 name: Apple Trees
 version: 2.5.X
 
+require:
+  - bolt
+
 data_pack:
   load: .
 

gm4_apple_trees/data/gm4_apple_trees/function/sapling/generate_tree.mcfunction

@@ -5,8 +5,7 @@
 
 # place jigsaw gm4_apple_trees:apple_trees gm4_apple_trees:trunk 2 ~ ~1 ~
     # jigsaw generation not usable after world-gen due to inherent position-based randomizaton
-execute store result score $blocks_moved gm4_apple_data run clone ~-4 ~1 ~-4 ~4 ~7 ~4 ~-4 ~1 ~-4 filtered #gm4_apple_trees:tree_placeable force
-execute unless score $blocks_moved gm4_apple_data matches 567 run return fail
+execute unless predicate gm4_apple_trees:valid_placement run return fail
 function gm4_apple_trees:sapling/grow/generate_random_tree
 execute if block ~ ~-1 ~ grass_block run setblock ~ ~-1 ~ dirt
 execute positioned ~ ~1 ~ as @e[type=armor_stand,tag=gm4_apple_uninitialized,distance=..6] run function gm4_apple_trees:leaf/initialize

gm4_apple_trees/data/gm4_apple_trees/predicate/valid_placement.json

@@ -0,0 +1,22 @@
+check = []
+for x in range(-4,5):
+    for y in range(1,8):
+        for z in range(-4,5):
+            check.append(
+                {
+                    "condition": "minecraft:location_check",
+                    "offsetX": x,
+                    "offsetY": y,
+                    "offsetZ": z,
+                    "predicate": {
+                        "block": {
+                            "blocks": "#gm4_apple_trees:tree_placeable"
+                        }
+                    }
+                }
+            )
+
+{
+    "condition": "minecraft:all_of",
+    "terms": check
+}