diff --git a/data/boomber/advancements/boomber.json b/data/boomber/advancements/boomber.json deleted file mode 100644 index cfc756c..0000000 --- a/data/boomber/advancements/boomber.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "display": { - "title": "Boomber", - "description": "", - "icon": { - "item": "minecraft:player_head", - "nbt": "{SkullOwner:{Name: \"Boomber\", Properties: {textures: [{Value: \"eyJ0aW1lc3RhbXAiOjE1NTc5OTkyNDIwMjcsInByb2ZpbGVJZCI6ImExNWZmYjIxOGE2YjQ2ODlhOTQ5Y2IxOWE3MDRmYTdhIiwicHJvZmlsZU5hbWUiOiJCb29tYmVyIiwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2FmYzFjZThjYWQ0MTQzOGVjYjU2N2NlMjA1NmVjOTA2M2UyMGFlMTgxYmZiNWViY2YyYWY2ZmRhNTZhNDI5YWYifX19\"}]}}}" - }, - "announce_to_chat": false, - "show_toast": false - }, - "parent": "global:root", - "criteria": { - "trigger": { - "trigger": "minecraft:tick" - } - } -} \ No newline at end of file diff --git a/data/boomber/advancements/carpet_on_stairs/carpet_on_stairs.json b/data/boomber/advancements/carpet_on_stairs.json similarity index 77% rename from data/boomber/advancements/carpet_on_stairs/carpet_on_stairs.json rename to data/boomber/advancements/carpet_on_stairs.json index bbf5047..7e255c3 100644 --- a/data/boomber/advancements/carpet_on_stairs/carpet_on_stairs.json +++ b/data/boomber/advancements/carpet_on_stairs.json @@ -1,6 +1,6 @@ { "display": { - "title": "Carpet on Stairs v4.0", + "title": "Carpet on Stairs", "description": "A complete rewrite", "icon": { "item": "minecraft:red_carpet" @@ -8,7 +8,7 @@ "announce_to_chat": false, "show_toast": false }, - "parent": "boomber:boomber", + "parent": "global:boomber", "criteria": { "trigger": { "trigger": "minecraft:tick" diff --git a/data/boomber/functions/carpet_on_stairs/carpet/apply_color.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/apply_color.mcfunction index 2a5bf2d..d22581d 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/apply_color.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/apply_color.mcfunction @@ -1,4 +1,4 @@ -scoreboard players operation #bb.cs.apply_color bb.variable = #bb.cs.model_id bb.variable -scoreboard players operation #bb.cs.apply_color bb.variable += #bb.cs.base_color bb.variable -scoreboard players operation #bb.cs.apply_color bb.variable += @s bb.cs.color -execute store result entity @s ArmorItems[-1].tag.CustomModelData int 1 run scoreboard players get #bb.cs.apply_color bb.variable \ No newline at end of file +scoreboard players operation #bb.cs.apply_color bb.cs.var = #base_model_id bb.cs.var +scoreboard players operation #bb.cs.apply_color bb.cs.var += #base_color bb.cs.var +scoreboard players operation #bb.cs.apply_color bb.cs.var += @s bb.cs.color +execute store result entity @s ArmorItems[-1].tag.CustomModelData int 1 run scoreboard players get #bb.cs.apply_color bb.cs.var \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/check/black.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/check/black.mcfunction index 1741749..5644152 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/check/black.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/check/black.mcfunction @@ -1,7 +1,7 @@ -scoreboard players set #bb.cs.color bb.variable 15 -scoreboard players set #bb.cs.success bb.success 0 -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:black_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:black_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:black_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:black_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:black_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file +scoreboard players set #color bb.cs.var 15 +scoreboard players set #raycast bb.cs.success 0 +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:black_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:black_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:black_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:black_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:black_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/check/blue.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/check/blue.mcfunction index d06c792..05e2c11 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/check/blue.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/check/blue.mcfunction @@ -1,7 +1,7 @@ -scoreboard players set #bb.cs.color bb.variable 11 -scoreboard players set #bb.cs.success bb.success 0 -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:blue_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:blue_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:blue_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:blue_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:blue_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file +scoreboard players set #color bb.cs.var 11 +scoreboard players set #raycast bb.cs.success 0 +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:blue_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:blue_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:blue_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:blue_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:blue_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/check/brown.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/check/brown.mcfunction index e3f9fb9..abba4ae 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/check/brown.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/check/brown.mcfunction @@ -1,7 +1,7 @@ -scoreboard players set #bb.cs.color bb.variable 12 -scoreboard players set #bb.cs.success bb.success 0 -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:brown_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:brown_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:brown_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:brown_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:brown_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file +scoreboard players set #color bb.cs.var 12 +scoreboard players set #raycast bb.cs.success 0 +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:brown_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:brown_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:brown_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:brown_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:brown_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/check/cyan.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/check/cyan.mcfunction index 59bcea3..de29aa7 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/check/cyan.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/check/cyan.mcfunction @@ -1,7 +1,7 @@ -scoreboard players set #bb.cs.color bb.variable 9 -scoreboard players set #bb.cs.success bb.success 0 -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:cyan_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:cyan_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:cyan_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:cyan_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:cyan_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file +scoreboard players set #color bb.cs.var 9 +scoreboard players set #raycast bb.cs.success 0 +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:cyan_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:cyan_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:cyan_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:cyan_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:cyan_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/check/gray.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/check/gray.mcfunction index 1d4ae5f..2156a5c 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/check/gray.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/check/gray.mcfunction @@ -1,7 +1,7 @@ -scoreboard players set #bb.cs.color bb.variable 7 -scoreboard players set #bb.cs.success bb.success 0 -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:gray_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:gray_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:gray_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:gray_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:gray_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file +scoreboard players set #color bb.cs.var 7 +scoreboard players set #raycast bb.cs.success 0 +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:gray_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:gray_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:gray_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:gray_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:gray_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/check/green.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/check/green.mcfunction index 876b559..08ca10b 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/check/green.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/check/green.mcfunction @@ -1,7 +1,7 @@ -scoreboard players set #bb.cs.color bb.variable 13 -scoreboard players set #bb.cs.success bb.success 0 -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:green_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:green_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:green_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:green_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:green_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file +scoreboard players set #color bb.cs.var 13 +scoreboard players set #raycast bb.cs.success 0 +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:green_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:green_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:green_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:green_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:green_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/check/light_blue.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/check/light_blue.mcfunction index 58d3ba2..6308b21 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/check/light_blue.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/check/light_blue.mcfunction @@ -1,7 +1,7 @@ -scoreboard players set #bb.cs.color bb.variable 3 -scoreboard players set #bb.cs.success bb.success 0 -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:light_blue_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:light_blue_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:light_blue_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:light_blue_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:light_blue_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file +scoreboard players set #color bb.cs.var 3 +scoreboard players set #raycast bb.cs.success 0 +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:light_blue_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:light_blue_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:light_blue_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:light_blue_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:light_blue_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/check/light_gray.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/check/light_gray.mcfunction index 9d42811..7b96aee 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/check/light_gray.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/check/light_gray.mcfunction @@ -1,7 +1,7 @@ -scoreboard players set #bb.cs.color bb.variable 8 -scoreboard players set #bb.cs.success bb.success 0 -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:light_gray_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:light_gray_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:light_gray_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:light_gray_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:light_gray_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file +scoreboard players set #color bb.cs.var 8 +scoreboard players set #raycast bb.cs.success 0 +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:light_gray_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:light_gray_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:light_gray_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:light_gray_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:light_gray_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/check/lime.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/check/lime.mcfunction index 2c76361..a7cb558 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/check/lime.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/check/lime.mcfunction @@ -1,7 +1,7 @@ -scoreboard players set #bb.cs.color bb.variable 5 -scoreboard players set #bb.cs.success bb.success 0 -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:lime_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:lime_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:lime_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:lime_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:lime_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file +scoreboard players set #color bb.cs.var 5 +scoreboard players set #raycast bb.cs.success 0 +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:lime_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:lime_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:lime_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:lime_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:lime_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/check/magenta.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/check/magenta.mcfunction index 9ca4cff..8c841d0 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/check/magenta.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/check/magenta.mcfunction @@ -1,7 +1,7 @@ -scoreboard players set #bb.cs.color bb.variable 2 -scoreboard players set #bb.cs.success bb.success 0 -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:magenta_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:magenta_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:magenta_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:magenta_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:magenta_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file +scoreboard players set #color bb.cs.var 2 +scoreboard players set #raycast bb.cs.success 0 +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:magenta_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:magenta_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:magenta_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:magenta_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:magenta_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/check/orange.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/check/orange.mcfunction index 775c6cb..704a70e 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/check/orange.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/check/orange.mcfunction @@ -1,7 +1,7 @@ -scoreboard players set #bb.cs.color bb.variable 1 -scoreboard players set #bb.cs.success bb.success 0 -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:orange_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:orange_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:orange_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:orange_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:orange_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file +scoreboard players set #color bb.cs.var 1 +scoreboard players set #raycast bb.cs.success 0 +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:orange_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:orange_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:orange_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:orange_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:orange_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/check/pink.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/check/pink.mcfunction index 6b81d33..e384664 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/check/pink.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/check/pink.mcfunction @@ -1,7 +1,7 @@ -scoreboard players set #bb.cs.color bb.variable 6 -scoreboard players set #bb.cs.success bb.success 0 -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:pink_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:pink_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:pink_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:pink_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:pink_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file +scoreboard players set #color bb.cs.var 6 +scoreboard players set #raycast bb.cs.success 0 +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:pink_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:pink_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:pink_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:pink_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:pink_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/check/purple.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/check/purple.mcfunction index e69f83c..68b49bd 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/check/purple.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/check/purple.mcfunction @@ -1,7 +1,7 @@ -scoreboard players set #bb.cs.color bb.variable 10 -scoreboard players set #bb.cs.success bb.success 0 -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:purple_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:purple_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:purple_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:purple_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:purple_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file +scoreboard players set #color bb.cs.var 10 +scoreboard players set #raycast bb.cs.success 0 +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:purple_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:purple_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:purple_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:purple_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:purple_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/check/red.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/check/red.mcfunction index 132844d..c9c3a17 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/check/red.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/check/red.mcfunction @@ -1,7 +1,7 @@ -scoreboard players set #bb.cs.color bb.variable 14 -scoreboard players set #bb.cs.success bb.success 0 -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:red_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:red_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:red_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:red_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:red_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file +scoreboard players set #color bb.cs.var 14 +scoreboard players set #raycast bb.cs.success 0 +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:red_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:red_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:red_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:red_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:red_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/check/white.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/check/white.mcfunction index 463e859..5f83e83 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/check/white.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/check/white.mcfunction @@ -1,7 +1,7 @@ -scoreboard players set #bb.cs.color bb.variable 0 -scoreboard players set #bb.cs.success bb.success 0 -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:white_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:white_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:white_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:white_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:white_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file +scoreboard players set #color bb.cs.var 0 +scoreboard players set #raycast bb.cs.success 0 +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:white_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:white_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:white_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:white_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:white_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/check/yellow.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/check/yellow.mcfunction index 4204f2d..dac228b 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/check/yellow.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/check/yellow.mcfunction @@ -1,7 +1,7 @@ -scoreboard players set #bb.cs.color bb.variable 4 -scoreboard players set #bb.cs.success bb.success 0 -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:yellow_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:yellow_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:yellow_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:yellow_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up -execute if score #bb.cs.success bb.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:yellow_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file +scoreboard players set #color bb.cs.var 4 +scoreboard players set #raycast bb.cs.success 0 +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^ ^-1 minecraft:yellow_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/behind +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^1 ^ ^ minecraft:yellow_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/left +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^-1 ^ ^ minecraft:yellow_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/right +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^1 ^ minecraft:yellow_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/up +execute if score #raycast bb.cs.success matches 0 rotated ~ 0 if block ^ ^-1 ^ minecraft:yellow_carpet unless block ~ ~-1 ~ #boomber:carpet_on_stairs/not_a_solid_ground run function boomber:carpet_on_stairs/carpet/found/down \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/found/behind.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/found/behind.mcfunction index 41f03c6..6dc8d02 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/found/behind.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/found/behind.mcfunction @@ -1,3 +1,3 @@ function boomber:carpet_on_stairs/carpet/spawn setblock ^ ^ ^-1 minecraft:air -scoreboard players set #bb.cs.success bb.success 1 \ No newline at end of file +scoreboard players set #raycast bb.cs.success 1 \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/found/down.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/found/down.mcfunction index 035696d..12f5b98 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/found/down.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/found/down.mcfunction @@ -1,3 +1,3 @@ function boomber:carpet_on_stairs/carpet/spawn setblock ^ ^-1 ^ minecraft:air -scoreboard players set #bb.cs.success bb.success 1 \ No newline at end of file +scoreboard players set #raycast bb.cs.success 1 \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/found/left.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/found/left.mcfunction index 4c91f3b..240b0a9 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/found/left.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/found/left.mcfunction @@ -1,3 +1,3 @@ function boomber:carpet_on_stairs/carpet/spawn setblock ^1 ^ ^ minecraft:air -scoreboard players set #bb.cs.success bb.success 1 \ No newline at end of file +scoreboard players set #raycast bb.cs.success 1 \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/found/right.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/found/right.mcfunction index 06f2b85..31c072c 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/found/right.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/found/right.mcfunction @@ -1,3 +1,3 @@ function boomber:carpet_on_stairs/carpet/spawn setblock ^-1 ^ ^ minecraft:air -scoreboard players set #bb.cs.success bb.success 1 \ No newline at end of file +scoreboard players set #raycast bb.cs.success 1 \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/found/up.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/found/up.mcfunction index c2de018..64e2068 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/found/up.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/found/up.mcfunction @@ -1,3 +1,3 @@ function boomber:carpet_on_stairs/carpet/spawn setblock ^ ^1 ^ minecraft:air -scoreboard players set #bb.cs.success bb.success 1 \ No newline at end of file +scoreboard players set #raycast bb.cs.success 1 \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/search/black.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/search/black.mcfunction index 33d595a..9fd33cf 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/search/black.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/search/black.mcfunction @@ -1,2 +1,2 @@ execute align xyz positioned ~0.5 ~0.5 ~0.5 if block ~ ~ ~ #boomber:carpet_on_stairs/carpetable unless entity @e[type=armor_stand, tag=boomber.carpet_on_stairs.carpet, distance=..0.3] run function boomber:carpet_on_stairs/carpet/check/black -execute as @s[distance=..5.5] if score #bb.cs.success bb.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/black \ No newline at end of file +execute as @s[distance=..5.5] if score #raycast bb.cs.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/black \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/search/blue.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/search/blue.mcfunction index 2edccd7..0ce5826 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/search/blue.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/search/blue.mcfunction @@ -1,2 +1,2 @@ execute align xyz positioned ~0.5 ~0.5 ~0.5 if block ~ ~ ~ #boomber:carpet_on_stairs/carpetable unless entity @e[type=armor_stand, tag=boomber.carpet_on_stairs.carpet, distance=..0.3] run function boomber:carpet_on_stairs/carpet/check/blue -execute as @s[distance=..5.5] if score #bb.cs.success bb.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/blue \ No newline at end of file +execute as @s[distance=..5.5] if score #raycast bb.cs.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/blue \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/search/brown.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/search/brown.mcfunction index 40ea5f3..3add35c 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/search/brown.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/search/brown.mcfunction @@ -1,2 +1,2 @@ execute align xyz positioned ~0.5 ~0.5 ~0.5 if block ~ ~ ~ #boomber:carpet_on_stairs/carpetable unless entity @e[type=armor_stand, tag=boomber.carpet_on_stairs.carpet, distance=..0.3] run function boomber:carpet_on_stairs/carpet/check/brown -execute as @s[distance=..5.5] if score #bb.cs.success bb.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/brown \ No newline at end of file +execute as @s[distance=..5.5] if score #raycast bb.cs.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/brown \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/search/cyan.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/search/cyan.mcfunction index daeec56..c83ac26 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/search/cyan.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/search/cyan.mcfunction @@ -1,2 +1,2 @@ execute align xyz positioned ~0.5 ~0.5 ~0.5 if block ~ ~ ~ #boomber:carpet_on_stairs/carpetable unless entity @e[type=armor_stand, tag=boomber.carpet_on_stairs.carpet, distance=..0.3] run function boomber:carpet_on_stairs/carpet/check/cyan -execute as @s[distance=..5.5] if score #bb.cs.success bb.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/cyan \ No newline at end of file +execute as @s[distance=..5.5] if score #raycast bb.cs.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/cyan \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/search/gray.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/search/gray.mcfunction index 6bac9a8..464432d 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/search/gray.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/search/gray.mcfunction @@ -1,2 +1,2 @@ execute align xyz positioned ~0.5 ~0.5 ~0.5 if block ~ ~ ~ #boomber:carpet_on_stairs/carpetable unless entity @e[type=armor_stand, tag=boomber.carpet_on_stairs.carpet, distance=..0.3] run function boomber:carpet_on_stairs/carpet/check/gray -execute as @s[distance=..5.5] if score #bb.cs.success bb.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/gray \ No newline at end of file +execute as @s[distance=..5.5] if score #raycast bb.cs.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/gray \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/search/green.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/search/green.mcfunction index 9bbdb06..fed27eb 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/search/green.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/search/green.mcfunction @@ -1,2 +1,2 @@ execute align xyz positioned ~0.5 ~0.5 ~0.5 if block ~ ~ ~ #boomber:carpet_on_stairs/carpetable unless entity @e[type=armor_stand, tag=boomber.carpet_on_stairs.carpet, distance=..0.3] run function boomber:carpet_on_stairs/carpet/check/green -execute as @s[distance=..5.5] if score #bb.cs.success bb.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/green \ No newline at end of file +execute as @s[distance=..5.5] if score #raycast bb.cs.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/green \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/search/light_blue.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/search/light_blue.mcfunction index caa5ea3..e369d9b 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/search/light_blue.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/search/light_blue.mcfunction @@ -1,2 +1,2 @@ execute align xyz positioned ~0.5 ~0.5 ~0.5 if block ~ ~ ~ #boomber:carpet_on_stairs/carpetable unless entity @e[type=armor_stand, tag=boomber.carpet_on_stairs.carpet, distance=..0.3] run function boomber:carpet_on_stairs/carpet/check/light_blue -execute as @s[distance=..5.5] if score #bb.cs.success bb.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/light_blue \ No newline at end of file +execute as @s[distance=..5.5] if score #raycast bb.cs.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/light_blue \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/search/light_gray.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/search/light_gray.mcfunction index c8f507d..91afb2c 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/search/light_gray.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/search/light_gray.mcfunction @@ -1,2 +1,2 @@ execute align xyz positioned ~0.5 ~0.5 ~0.5 if block ~ ~ ~ #boomber:carpet_on_stairs/carpetable unless entity @e[type=armor_stand, tag=boomber.carpet_on_stairs.carpet, distance=..0.3] run function boomber:carpet_on_stairs/carpet/check/light_gray -execute as @s[distance=..5.5] if score #bb.cs.success bb.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/light_gray \ No newline at end of file +execute as @s[distance=..5.5] if score #raycast bb.cs.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/light_gray \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/search/lime.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/search/lime.mcfunction index 293610d..05893c6 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/search/lime.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/search/lime.mcfunction @@ -1,2 +1,2 @@ execute align xyz positioned ~0.5 ~0.5 ~0.5 if block ~ ~ ~ #boomber:carpet_on_stairs/carpetable unless entity @e[type=armor_stand, tag=boomber.carpet_on_stairs.carpet, distance=..0.3] run function boomber:carpet_on_stairs/carpet/check/lime -execute as @s[distance=..5.5] if score #bb.cs.success bb.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/lime \ No newline at end of file +execute as @s[distance=..5.5] if score #raycast bb.cs.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/lime \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/search/magenta.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/search/magenta.mcfunction index f7de6da..5e8be95 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/search/magenta.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/search/magenta.mcfunction @@ -1,2 +1,2 @@ execute align xyz positioned ~0.5 ~0.5 ~0.5 if block ~ ~ ~ #boomber:carpet_on_stairs/carpetable unless entity @e[type=armor_stand, tag=boomber.carpet_on_stairs.carpet, distance=..0.3] run function boomber:carpet_on_stairs/carpet/check/magenta -execute as @s[distance=..5.5] if score #bb.cs.success bb.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/magenta \ No newline at end of file +execute as @s[distance=..5.5] if score #raycast bb.cs.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/magenta \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/search/orange.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/search/orange.mcfunction index 353d8ae..3e23691 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/search/orange.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/search/orange.mcfunction @@ -1,2 +1,2 @@ execute align xyz positioned ~0.5 ~0.5 ~0.5 if block ~ ~ ~ #boomber:carpet_on_stairs/carpetable unless entity @e[type=armor_stand, tag=boomber.carpet_on_stairs.carpet, distance=..0.3] run function boomber:carpet_on_stairs/carpet/check/orange -execute as @s[distance=..5.5] if score #bb.cs.success bb.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/orange \ No newline at end of file +execute as @s[distance=..5.5] if score #raycast bb.cs.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/orange \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/search/pink.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/search/pink.mcfunction index 7b08689..65c8306 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/search/pink.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/search/pink.mcfunction @@ -1,2 +1,2 @@ execute align xyz positioned ~0.5 ~0.5 ~0.5 if block ~ ~ ~ #boomber:carpet_on_stairs/carpetable unless entity @e[type=armor_stand, tag=boomber.carpet_on_stairs.carpet, distance=..0.3] run function boomber:carpet_on_stairs/carpet/check/pink -execute as @s[distance=..5.5] if score #bb.cs.success bb.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/pink \ No newline at end of file +execute as @s[distance=..5.5] if score #raycast bb.cs.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/pink \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/search/purple.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/search/purple.mcfunction index 0d3ed75..dc0ca2f 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/search/purple.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/search/purple.mcfunction @@ -1,2 +1,2 @@ execute align xyz positioned ~0.5 ~0.5 ~0.5 if block ~ ~ ~ #boomber:carpet_on_stairs/carpetable unless entity @e[type=armor_stand, tag=boomber.carpet_on_stairs.carpet, distance=..0.3] run function boomber:carpet_on_stairs/carpet/check/purple -execute as @s[distance=..5.5] if score #bb.cs.success bb.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/purple \ No newline at end of file +execute as @s[distance=..5.5] if score #raycast bb.cs.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/purple \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/search/red.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/search/red.mcfunction index 368b086..9b0d2a2 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/search/red.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/search/red.mcfunction @@ -1,2 +1,2 @@ execute align xyz positioned ~0.5 ~0.5 ~0.5 if block ~ ~ ~ #boomber:carpet_on_stairs/carpetable unless entity @e[type=armor_stand, tag=boomber.carpet_on_stairs.carpet, distance=..0.3] run function boomber:carpet_on_stairs/carpet/check/red -execute as @s[distance=..5.5] if score #bb.cs.success bb.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/red \ No newline at end of file +execute as @s[distance=..5.5] if score #raycast bb.cs.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/red \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/search/red_carpet.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/search/red_carpet.mcfunction index 3cd7803..aaa8a05 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/search/red_carpet.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/search/red_carpet.mcfunction @@ -1,2 +1,2 @@ execute align xyz positioned ~0.5 ~0.5 ~0.5 if block ~ ~ ~ #boomber:carpet_on_stairs/carpetable unless entity @e[type=armor_stand, tag=boomber.carpet_on_stairs.carpet] run function boomber:carpet_on_stairs/carpet/check/red_carpet -execute as @s[distance=..5.5] if score #bb.cs.success bb.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/red_carpet \ No newline at end of file +execute as @s[distance=..5.5] if score #raycast bb.cs.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/red_carpet \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/search/white.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/search/white.mcfunction index 3a7b5f1..43b8246 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/search/white.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/search/white.mcfunction @@ -1,2 +1,2 @@ execute align xyz positioned ~0.5 ~0.5 ~0.5 if block ~ ~ ~ #boomber:carpet_on_stairs/carpetable unless entity @e[type=armor_stand, tag=boomber.carpet_on_stairs.carpet, distance=..0.3] run function boomber:carpet_on_stairs/carpet/check/white -execute as @s[distance=..5.5] if score #bb.cs.success bb.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/white \ No newline at end of file +execute as @s[distance=..5.5] if score #raycast bb.cs.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/white \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/search/yellow.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/search/yellow.mcfunction index 7669405..c3c1bcf 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/search/yellow.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/search/yellow.mcfunction @@ -1,2 +1,2 @@ execute align xyz positioned ~0.5 ~0.5 ~0.5 if block ~ ~ ~ #boomber:carpet_on_stairs/carpetable unless entity @e[type=armor_stand, tag=boomber.carpet_on_stairs.carpet, distance=..0.3] run function boomber:carpet_on_stairs/carpet/check/yellow -execute as @s[distance=..5.5] if score #bb.cs.success bb.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/yellow \ No newline at end of file +execute as @s[distance=..5.5] if score #raycast bb.cs.success matches 0 positioned ^ ^ ^0.1 run function boomber:carpet_on_stairs/carpet/search/yellow \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/spawn.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/spawn.mcfunction index aec9085..86b9fc9 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/spawn.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/spawn.mcfunction @@ -1,2 +1,2 @@ -summon armor_stand ~ ~ ~ {Tags: ['boomber.carpet_on_stairs.carpet', 'boomber.carpet_on_stairs.spawning'], Invisible: 1b, Marker: 1b, Small: 1b, Silent: 1b, Invulnerable: 1b} +summon armor_stand ~ ~ ~ {Tags: ['boomber.carpet_on_stairs.carpet', 'boomber.carpet_on_stairs.spawning', 'global.ignore', 'global.ignore.pos', 'global.ignore.gui'], Invisible: 1b, Marker: 1b, Small: 1b, Silent: 1b, Invulnerable: 1b} execute as @e[type=armor_stand, tag=boomber.carpet_on_stairs.spawning, limit=1] run function boomber:carpet_on_stairs/carpet/spawn/init \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/spawn/extension.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/spawn/extension.mcfunction index 913fab7..8df017b 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/spawn/extension.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/spawn/extension.mcfunction @@ -1,2 +1,2 @@ -scoreboard players set #bb.cs.base_color bb.variable 0 +scoreboard players set #base_color bb.cs.var 0 tag @s add boomber.carpet_on_stairs.extension \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/spawn/init.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/spawn/init.mcfunction index 9c6f099..744b08f 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/spawn/init.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/spawn/init.mcfunction @@ -1,11 +1,11 @@ loot replace entity @s armor.head loot boomber:carpet_on_stairs/template/carpet -scoreboard players set #bb.cs.base_color bb.variable -1 -execute if score #bb.cs.base_color bb.variable matches -1 if block ~ ~ ~ #boomber:carpet_on_stairs/slabs[type=bottom] run function boomber:carpet_on_stairs/carpet/spawn/slabs -execute if score #bb.cs.base_color bb.variable matches -1 if block ~ ~ ~ #boomber:carpet_on_stairs/stairs[half=bottom] run function boomber:carpet_on_stairs/carpet/spawn/stairs -execute if score #bb.cs.base_color bb.variable matches -1 if block ~ ~ ~ #boomber:carpet_on_stairs/extension run function boomber:carpet_on_stairs/carpet/spawn/extension +scoreboard players set #base_color bb.cs.var -1 +execute if score #base_color bb.cs.var matches -1 if block ~ ~ ~ #boomber:carpet_on_stairs/slabs[type=bottom] run function boomber:carpet_on_stairs/carpet/spawn/slabs +execute if score #base_color bb.cs.var matches -1 if block ~ ~ ~ #boomber:carpet_on_stairs/stairs[half=bottom] run function boomber:carpet_on_stairs/carpet/spawn/stairs +execute if score #base_color bb.cs.var matches -1 if block ~ ~ ~ #boomber:carpet_on_stairs/extension run function boomber:carpet_on_stairs/carpet/spawn/extension -scoreboard players operation @s bb.cs.color = #bb.cs.color bb.variable +scoreboard players operation @s bb.cs.color = #color bb.cs.var function boomber:carpet_on_stairs/carpet/apply_color tag @s remove boomber.carpet_on_stairs.spawning \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/spawn/slabs.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/spawn/slabs.mcfunction index 8e6ca44..cf37013 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/spawn/slabs.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/spawn/slabs.mcfunction @@ -1,2 +1,2 @@ -scoreboard players set #bb.cs.base_color bb.variable 16 +scoreboard players set #base_color bb.cs.var 16 tag @s add boomber.carpet_on_stairs.slabs \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/spawn/stairs.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/spawn/stairs.mcfunction index f4430f4..70ac7d3 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/spawn/stairs.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/spawn/stairs.mcfunction @@ -1,2 +1,2 @@ -scoreboard players set #bb.cs.base_color bb.variable 32 +scoreboard players set #base_color bb.cs.var 32 tag @s add boomber.carpet_on_stairs.stairs \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/update/shape/inner_left.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/update/shape/inner_left.mcfunction index 16c47ea..92b7811 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/update/shape/inner_left.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/update/shape/inner_left.mcfunction @@ -1 +1 @@ -scoreboard players set #bb.cs.base_color bb.variable 48 \ No newline at end of file +scoreboard players set #base_color bb.cs.var 48 \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/update/shape/inner_right.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/update/shape/inner_right.mcfunction index c64128c..73beef0 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/update/shape/inner_right.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/update/shape/inner_right.mcfunction @@ -1 +1 @@ -scoreboard players set #bb.cs.base_color bb.variable 64 \ No newline at end of file +scoreboard players set #base_color bb.cs.var 64 \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/update/shape/outer_left.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/update/shape/outer_left.mcfunction index e24947f..c85c4a1 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/update/shape/outer_left.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/update/shape/outer_left.mcfunction @@ -1 +1 @@ -scoreboard players set #bb.cs.base_color bb.variable 80 \ No newline at end of file +scoreboard players set #base_color bb.cs.var 80 \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/update/shape/outer_right.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/update/shape/outer_right.mcfunction index 37b8c5a..6c99b73 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/update/shape/outer_right.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/update/shape/outer_right.mcfunction @@ -1 +1 @@ -scoreboard players set #bb.cs.base_color bb.variable 96 \ No newline at end of file +scoreboard players set #base_color bb.cs.var 96 \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/carpet/update/shape/straight.mcfunction b/data/boomber/functions/carpet_on_stairs/carpet/update/shape/straight.mcfunction index c78ea62..3f77c68 100644 --- a/data/boomber/functions/carpet_on_stairs/carpet/update/shape/straight.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/carpet/update/shape/straight.mcfunction @@ -1 +1 @@ -scoreboard players set #bb.cs.base_color bb.variable 32 \ No newline at end of file +scoreboard players set #base_color bb.cs.var 32 \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/cleanup.mcfunction b/data/boomber/functions/carpet_on_stairs/cleanup.mcfunction new file mode 100644 index 0000000..e763940 --- /dev/null +++ b/data/boomber/functions/carpet_on_stairs/cleanup.mcfunction @@ -0,0 +1,5 @@ +scoreboard objectives remove bb.cs.color +scoreboard objectives remove bb.cs.success +scoreboard objectives remove bb.cs.var + +kill @e[tag=boomber.carpet_on_stairs.carpet] \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/event/place_carpet/black.mcfunction b/data/boomber/functions/carpet_on_stairs/event/place_carpet/black.mcfunction index df33ef6..4a89e04 100644 --- a/data/boomber/functions/carpet_on_stairs/event/place_carpet/black.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/event/place_carpet/black.mcfunction @@ -1,3 +1,3 @@ -scoreboard players set #bb.cs.success bb.success 0 +scoreboard players set #raycast bb.cs.success 0 execute if predicate boomber:carpet_on_stairs/is_sneaking anchored eyes positioned ^ ^ ^0.1 anchored feet run function boomber:carpet_on_stairs/carpet/search/black advancement revoke @s from boomber:carpet_on_stairs/event/root \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/event/place_carpet/blue.mcfunction b/data/boomber/functions/carpet_on_stairs/event/place_carpet/blue.mcfunction index ee23376..30e518c 100644 --- a/data/boomber/functions/carpet_on_stairs/event/place_carpet/blue.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/event/place_carpet/blue.mcfunction @@ -1,3 +1,3 @@ -scoreboard players set #bb.cs.success bb.success 0 +scoreboard players set #raycast bb.cs.success 0 execute if predicate boomber:carpet_on_stairs/is_sneaking anchored eyes positioned ^ ^ ^0.1 anchored feet run function boomber:carpet_on_stairs/carpet/search/blue advancement revoke @s from boomber:carpet_on_stairs/event/root \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/event/place_carpet/brown.mcfunction b/data/boomber/functions/carpet_on_stairs/event/place_carpet/brown.mcfunction index 59948a5..0370db6 100644 --- a/data/boomber/functions/carpet_on_stairs/event/place_carpet/brown.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/event/place_carpet/brown.mcfunction @@ -1,3 +1,3 @@ -scoreboard players set #bb.cs.success bb.success 0 +scoreboard players set #raycast bb.cs.success 0 execute if predicate boomber:carpet_on_stairs/is_sneaking anchored eyes positioned ^ ^ ^0.1 anchored feet run function boomber:carpet_on_stairs/carpet/search/brown advancement revoke @s from boomber:carpet_on_stairs/event/root \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/event/place_carpet/cyan.mcfunction b/data/boomber/functions/carpet_on_stairs/event/place_carpet/cyan.mcfunction index b34330c..9a3c12f 100644 --- a/data/boomber/functions/carpet_on_stairs/event/place_carpet/cyan.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/event/place_carpet/cyan.mcfunction @@ -1,3 +1,3 @@ -scoreboard players set #bb.cs.success bb.success 0 +scoreboard players set #raycast bb.cs.success 0 execute if predicate boomber:carpet_on_stairs/is_sneaking anchored eyes positioned ^ ^ ^0.1 anchored feet run function boomber:carpet_on_stairs/carpet/search/cyan advancement revoke @s from boomber:carpet_on_stairs/event/root \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/event/place_carpet/gray.mcfunction b/data/boomber/functions/carpet_on_stairs/event/place_carpet/gray.mcfunction index 3daa4a0..84f30c0 100644 --- a/data/boomber/functions/carpet_on_stairs/event/place_carpet/gray.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/event/place_carpet/gray.mcfunction @@ -1,3 +1,3 @@ -scoreboard players set #bb.cs.success bb.success 0 +scoreboard players set #raycast bb.cs.success 0 execute if predicate boomber:carpet_on_stairs/is_sneaking anchored eyes positioned ^ ^ ^0.1 anchored feet run function boomber:carpet_on_stairs/carpet/search/gray advancement revoke @s from boomber:carpet_on_stairs/event/root \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/event/place_carpet/green.mcfunction b/data/boomber/functions/carpet_on_stairs/event/place_carpet/green.mcfunction index dc9a827..1d38418 100644 --- a/data/boomber/functions/carpet_on_stairs/event/place_carpet/green.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/event/place_carpet/green.mcfunction @@ -1,3 +1,3 @@ -scoreboard players set #bb.cs.success bb.success 0 +scoreboard players set #raycast bb.cs.success 0 execute if predicate boomber:carpet_on_stairs/is_sneaking anchored eyes positioned ^ ^ ^0.1 anchored feet run function boomber:carpet_on_stairs/carpet/search/green advancement revoke @s from boomber:carpet_on_stairs/event/root \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/event/place_carpet/light_blue.mcfunction b/data/boomber/functions/carpet_on_stairs/event/place_carpet/light_blue.mcfunction index 731d5c2..5b0393f 100644 --- a/data/boomber/functions/carpet_on_stairs/event/place_carpet/light_blue.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/event/place_carpet/light_blue.mcfunction @@ -1,3 +1,3 @@ -scoreboard players set #bb.cs.success bb.success 0 +scoreboard players set #raycast bb.cs.success 0 execute if predicate boomber:carpet_on_stairs/is_sneaking anchored eyes positioned ^ ^ ^0.1 anchored feet run function boomber:carpet_on_stairs/carpet/search/light_blue advancement revoke @s from boomber:carpet_on_stairs/event/root \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/event/place_carpet/light_gray.mcfunction b/data/boomber/functions/carpet_on_stairs/event/place_carpet/light_gray.mcfunction index c5c0cd5..edec648 100644 --- a/data/boomber/functions/carpet_on_stairs/event/place_carpet/light_gray.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/event/place_carpet/light_gray.mcfunction @@ -1,3 +1,3 @@ -scoreboard players set #bb.cs.success bb.success 0 +scoreboard players set #raycast bb.cs.success 0 execute if predicate boomber:carpet_on_stairs/is_sneaking anchored eyes positioned ^ ^ ^0.1 anchored feet run function boomber:carpet_on_stairs/carpet/search/light_gray advancement revoke @s from boomber:carpet_on_stairs/event/root \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/event/place_carpet/lime.mcfunction b/data/boomber/functions/carpet_on_stairs/event/place_carpet/lime.mcfunction index 94563ce..a483204 100644 --- a/data/boomber/functions/carpet_on_stairs/event/place_carpet/lime.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/event/place_carpet/lime.mcfunction @@ -1,3 +1,3 @@ -scoreboard players set #bb.cs.success bb.success 0 +scoreboard players set #raycast bb.cs.success 0 execute if predicate boomber:carpet_on_stairs/is_sneaking anchored eyes positioned ^ ^ ^0.1 anchored feet run function boomber:carpet_on_stairs/carpet/search/lime advancement revoke @s from boomber:carpet_on_stairs/event/root \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/event/place_carpet/magenta.mcfunction b/data/boomber/functions/carpet_on_stairs/event/place_carpet/magenta.mcfunction index 7ae83b5..c45e621 100644 --- a/data/boomber/functions/carpet_on_stairs/event/place_carpet/magenta.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/event/place_carpet/magenta.mcfunction @@ -1,3 +1,3 @@ -scoreboard players set #bb.cs.success bb.success 0 +scoreboard players set #raycast bb.cs.success 0 execute if predicate boomber:carpet_on_stairs/is_sneaking anchored eyes positioned ^ ^ ^0.1 anchored feet run function boomber:carpet_on_stairs/carpet/search/magenta advancement revoke @s from boomber:carpet_on_stairs/event/root \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/event/place_carpet/orange.mcfunction b/data/boomber/functions/carpet_on_stairs/event/place_carpet/orange.mcfunction index 93fe2fa..46b2462 100644 --- a/data/boomber/functions/carpet_on_stairs/event/place_carpet/orange.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/event/place_carpet/orange.mcfunction @@ -1,3 +1,3 @@ -scoreboard players set #bb.cs.success bb.success 0 +scoreboard players set #raycast bb.cs.success 0 execute if predicate boomber:carpet_on_stairs/is_sneaking anchored eyes positioned ^ ^ ^0.1 anchored feet run function boomber:carpet_on_stairs/carpet/search/orange advancement revoke @s from boomber:carpet_on_stairs/event/root \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/event/place_carpet/pink.mcfunction b/data/boomber/functions/carpet_on_stairs/event/place_carpet/pink.mcfunction index 7100b0a..e80acd9 100644 --- a/data/boomber/functions/carpet_on_stairs/event/place_carpet/pink.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/event/place_carpet/pink.mcfunction @@ -1,3 +1,3 @@ -scoreboard players set #bb.cs.success bb.success 0 +scoreboard players set #raycast bb.cs.success 0 execute if predicate boomber:carpet_on_stairs/is_sneaking anchored eyes positioned ^ ^ ^0.1 anchored feet run function boomber:carpet_on_stairs/carpet/search/pink advancement revoke @s from boomber:carpet_on_stairs/event/root \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/event/place_carpet/purple.mcfunction b/data/boomber/functions/carpet_on_stairs/event/place_carpet/purple.mcfunction index e3c2d47..b7023d2 100644 --- a/data/boomber/functions/carpet_on_stairs/event/place_carpet/purple.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/event/place_carpet/purple.mcfunction @@ -1,3 +1,3 @@ -scoreboard players set #bb.cs.success bb.success 0 +scoreboard players set #raycast bb.cs.success 0 execute if predicate boomber:carpet_on_stairs/is_sneaking anchored eyes positioned ^ ^ ^0.1 anchored feet run function boomber:carpet_on_stairs/carpet/search/purple advancement revoke @s from boomber:carpet_on_stairs/event/root \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/event/place_carpet/red.mcfunction b/data/boomber/functions/carpet_on_stairs/event/place_carpet/red.mcfunction index bffd3c8..2d303e7 100644 --- a/data/boomber/functions/carpet_on_stairs/event/place_carpet/red.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/event/place_carpet/red.mcfunction @@ -1,3 +1,3 @@ -scoreboard players set #bb.cs.success bb.success 0 +scoreboard players set #raycast bb.cs.success 0 execute if predicate boomber:carpet_on_stairs/is_sneaking anchored eyes positioned ^ ^ ^0.1 anchored feet run function boomber:carpet_on_stairs/carpet/search/red advancement revoke @s from boomber:carpet_on_stairs/event/root \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/event/place_carpet/white.mcfunction b/data/boomber/functions/carpet_on_stairs/event/place_carpet/white.mcfunction index 60874e0..dcdf0aa 100644 --- a/data/boomber/functions/carpet_on_stairs/event/place_carpet/white.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/event/place_carpet/white.mcfunction @@ -1,3 +1,3 @@ -scoreboard players set #bb.cs.success bb.success 0 +scoreboard players set #raycast bb.cs.success 0 execute if predicate boomber:carpet_on_stairs/is_sneaking anchored eyes positioned ^ ^ ^0.1 anchored feet run function boomber:carpet_on_stairs/carpet/search/white advancement revoke @s from boomber:carpet_on_stairs/event/root \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/event/place_carpet/yellow.mcfunction b/data/boomber/functions/carpet_on_stairs/event/place_carpet/yellow.mcfunction index 947068a..b715b53 100644 --- a/data/boomber/functions/carpet_on_stairs/event/place_carpet/yellow.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/event/place_carpet/yellow.mcfunction @@ -1,3 +1,3 @@ -scoreboard players set #bb.cs.success bb.success 0 +scoreboard players set #raycast bb.cs.success 0 execute if predicate boomber:carpet_on_stairs/is_sneaking anchored eyes positioned ^ ^ ^0.1 anchored feet run function boomber:carpet_on_stairs/carpet/search/yellow advancement revoke @s from boomber:carpet_on_stairs/event/root \ No newline at end of file diff --git a/data/boomber/functions/carpet_on_stairs/setup.mcfunction b/data/boomber/functions/carpet_on_stairs/setup.mcfunction index fcea33a..6399ee4 100644 --- a/data/boomber/functions/carpet_on_stairs/setup.mcfunction +++ b/data/boomber/functions/carpet_on_stairs/setup.mcfunction @@ -1,7 +1,5 @@ -scoreboard objectives add bb.variable dummy -scoreboard objectives add bb.calculation dummy -scoreboard objectives add bb.success dummy - +scoreboard objectives add bb.cs.var dummy +scoreboard objectives add bb.cs.success dummy scoreboard objectives add bb.cs.color dummy -scoreboard players set #bb.cs.model_id bb.variable 8080000 \ No newline at end of file +scoreboard players set #base_model_id bb.cs.var 8080000 \ No newline at end of file diff --git a/data/boomber/loot_tables/carpet_on_stairs/template/carpet.json b/data/boomber/loot_tables/carpet_on_stairs/template/carpet.json index 8cc78f5..ed5873e 100644 --- a/data/boomber/loot_tables/carpet_on_stairs/template/carpet.json +++ b/data/boomber/loot_tables/carpet_on_stairs/template/carpet.json @@ -10,7 +10,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{CustomModelData: 0, ucit: {id: \"carpet\", from: \"boomber:carpet_on_stairs\"}}" + "tag": "{CustomModelData: 0, ctc: {id: \"carpet\", from: \"boomber:carpet_on_stairs\", traits: []}}" } ] } diff --git a/data/global/advancements/boomber.json b/data/global/advancements/boomber.json new file mode 100644 index 0000000..8bcb7ce --- /dev/null +++ b/data/global/advancements/boomber.json @@ -0,0 +1,18 @@ +{ + "display": { + "title": "Boomber", + "description": "", + "icon": { + "item": "minecraft:player_head", + "nbt": "{SkullOwner: 'Boomber'}" + }, + "announce_to_chat": false, + "show_toast": false + }, + "parent": "global:root", + "criteria": { + "trigger": { + "trigger": "minecraft:tick" + } + } +} \ No newline at end of file diff --git a/pack.mcmeta b/pack.mcmeta index 56531c1..8d1d00d 100644 --- a/pack.mcmeta +++ b/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 1, + "pack_format": 5, "description": [ {"text": "This is ", "color": "red"}, {"text": "NOT", "color": "dark_red", "bold": true, "underlined": true},