Fix block tags for 21w13a+

Remove copper slab/stair variations which once caused the tags to fail in versions above 21w13a. Some tag entries are no longer required for 1.16.2~1.16.5 compatibility

data/mrcd/functions/private/category/pcp_117.mcfunction

@@ -0,0 +1,3 @@
+execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ small_dripleaf run function mrcd:private/types/small_dripleaf
+execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ big_dripleaf_stem run function mrcd:private/types/big_dripleaf_stem/main
+execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ spore_blossom run function mrcd:private/types/spore_blossom

data/mrcd/functions/private/category/player_can_pass.mcfunction

@@ -19,9 +19,6 @@ execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ twisting_vines run funct
 execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ twisting_vines_plant run function mrcd:private/types/twisting_vines_plant
 execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ nether_sprouts run function mrcd:private/types/sprouts
 execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ soul_fire run function mrcd:private/types/soul_fire
-execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ small_dripleaf run function mrcd:private/types/small_dripleaf
-execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ big_dripleaf_stem run function mrcd:private/types/big_dripleaf_stem/main
-execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ spore_blossom run function mrcd:private/types/spore_blossom
 
 execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ #wall_signs run function mrcd:private/types/wall_sign
 execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ #buttons run function mrcd:private/types/button
@@ -46,3 +43,5 @@ execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ #mrcd:pressure_plate_lik
 execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ #mrcd:mushroom run function mrcd:private/types/mushroom
 execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ #mrcd:fungus run function mrcd:private/types/fungus
 execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ #mrcd:roots run function mrcd:private/types/roots
+
+function mrcd:private/category/pcp_117

data/mrcd/functions/private/category/solid.mcfunction

@@ -8,8 +8,6 @@ execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ bell run function mrcd:p
 execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ hopper run function mrcd:private/types/hopper
 execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ lectern run function mrcd:private/types/lectern
 execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ chorus_plant run function mrcd:private/types/chorus_plant
-execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ big_dripleaf run function mrcd:private/types/big_dripleaf/main
-execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ candle_cake run function mrcd:private/types/candle_cake
 
 execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ #walls run function mrcd:private/types/wall
 execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ #fences run function mrcd:private/types/fence
@@ -35,11 +33,6 @@ execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ cake run function mrcd:p
 execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ ender_chest run function mrcd:private/types/chest
 execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ bamboo run function mrcd:private/types/bamboo
 execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ chain run function mrcd:private/types/chain
-execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ small_amethyst_bud run function mrcd:private/types/small_amethyst_bud/main
-execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ medium_amethyst_bud run function mrcd:private/types/medium_amethyst_bud/main
-execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ large_amethyst_bud run function mrcd:private/types/large_amethyst_bud/main
-execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ amethyst_cluster run function mrcd:private/types/amethyst_cluster/main
-execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ pointed_dripstone run function mrcd:private/types/pointed_dripstone/main
 execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ turtle_egg run function mrcd:private/types/turtle_egg/main
 
 execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ #campfires run function mrcd:private/types/campfires
@@ -57,3 +50,5 @@ execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ #mrcd:skull_like run fun
 execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ #mrcd:wall_skull_like run function mrcd:private/types/wall_skull
 execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ #mrcd:grass_path_like run function mrcd:private/types/grass_path
 execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ #mrcd:rod_like run function mrcd:private/types/rod/main
+
+function mrcd:private/category/solid_117

data/mrcd/functions/private/category/solid_117.mcfunction

@@ -0,0 +1,8 @@
+execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ big_dripleaf run function mrcd:private/types/big_dripleaf/main
+execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ candle_cake run function mrcd:private/types/candle_cake
+
+execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ small_amethyst_bud run function mrcd:private/types/small_amethyst_bud/main
+execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ medium_amethyst_bud run function mrcd:private/types/medium_amethyst_bud/main
+execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ large_amethyst_bud run function mrcd:private/types/large_amethyst_bud/main
+execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ amethyst_cluster run function mrcd:private/types/amethyst_cluster/main
+execute if entity @s[tag=!mrcd_detected] if block ~ ~ ~ pointed_dripstone run function mrcd:private/types/pointed_dripstone/main

data/mrcd/tags/blocks/carpet_like.json

@@ -1,6 +1,6 @@
 {
   "values": [
     "#minecraft:carpets",
-    "minecraft:moss_carpet"
+    {"id": "minecraft:moss_carpet", "required": false}
   ]
 }

data/mrcd/tags/blocks/grass_path_like.json

@@ -1,4 +1,5 @@
 {"values":[
-    "minecraft:dirt_path",
+    {"id": "minecraft:grass_path", "required": false},
+    {"id": "minecraft:dirt_path", "required": false},
     "minecraft:farmland"
 ]}

data/mrcd/tags/blocks/hanging_roots_like.json

@@ -1,6 +1,6 @@
 {
   "values": [
     "minecraft:weeping_vines",
-    "minecraft:hanging_roots"
+    {"id": "minecraft:hanging_roots", "required": false}
     ]
 }

data/mrcd/tags/blocks/player_can_pass.json

@@ -62,8 +62,8 @@
     "minecraft:water",
     "minecraft:nether_portal",
 
-    "minecraft:small_dripleaf",
-    "minecraft:big_dripleaf_stem",
-    "minecraft:spore_blossom"
+    {"id": "minecraft:small_dripleaf", "required": false},
+    {"id": "minecraft:big_dripleaf_stem", "required": false},
+    {"id": "minecraft:spore_blossom", "required": false}
 
 ]}

data/mrcd/tags/blocks/rod_like.json

@@ -1,6 +1,6 @@
 {
   "values": [
     "minecraft:end_rod",
-    "minecraft:lightning_rod"
+    {"id": "minecraft:lightning_rod", "required": false}
   ]
 }

data/mrcd/tags/blocks/slab_like.json

@@ -1,13 +1,6 @@
 {
   "values":[
     "#minecraft:slabs",
-    "minecraft:cut_copper_slab",
-    "minecraft:exposed_cut_copper_slab",
-    "minecraft:weathered_cut_copper_slab",
-    "minecraft:oxidized_cut_copper_slab",
-    "minecraft:waxed_cut_copper_slab",
-    "minecraft:waxed_exposed_cut_copper_slab",
-    "minecraft:waxed_weathered_cut_copper_slab",
-    "minecraft:sculk_sensor"
+    {"id": "minecraft:sculk_sensor", "required": false}
   ]
 }

data/mrcd/tags/blocks/stair_like.json

@@ -1,12 +1,5 @@
 {
   "values":[
-    "#minecraft:stairs",
-    "minecraft:cut_copper_stairs",
-    "minecraft:exposed_cut_copper_stairs",
-    "minecraft:weathered_cut_copper_stairs",
-    "minecraft:oxidized_cut_copper_stairs",
-    "minecraft:waxed_cut_copper_stairs",
-    "minecraft:waxed_exposed_cut_copper_stairs",
-    "minecraft:waxed_weathered_cut_copper_stairs"
+    "#minecraft:stairs"
   ]
 }

data/mrcd/tags/blocks/vine_like.json

@@ -1,5 +1,5 @@
 {"values":[
     "minecraft:vine",
     "minecraft:fire",
-    "minecraft:glow_lichen"
+    {"id": "minecraft:glow_lichen", "required": false}
 ]}

data/mrcd/tags/blocks/weeping_like.json

@@ -1,7 +1,7 @@
 {
   "values": [
     "minecraft:weeping_vines_plant",
-    "minecraft:cave_vines_head",
-    "minecraft:cave_vines_body"
+    {"id": "minecraft:cave_vines_head", "required": false},
+    {"id": "minecraft:cave_vines_body", "required": false}
     ]
 }

data/mrcd/tags/entity_types/ignore.json

@@ -11,7 +11,7 @@
 		"minecraft:fishing_bobber",
 		"minecraft:item",
 		"minecraft:item_frame",
-		"minecraft:glow_item_frame",
+		{"id": "minecraft:glow_item_frame", "required": false},
 		"minecraft:leash_knot",
 		"minecraft:lightning_bolt",
 		"minecraft:player",