Skip to content

Commit

Permalink
Follow official conventions
Browse files Browse the repository at this point in the history
  • Loading branch information
oOBoomberOo committed May 7, 2020
1 parent cc23d0c commit 642675a
Show file tree
Hide file tree
Showing 72 changed files with 198 additions and 195 deletions.
18 changes: 0 additions & 18 deletions data/boomber/advancements/boomber.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"display": {
"title": "Carpet on Stairs v4.0",
"title": "Carpet on Stairs",
"description": "A complete rewrite",
"icon": {
"item": "minecraft:red_carpet"
},
"announce_to_chat": false,
"show_toast": false
},
"parent": "boomber:boomber",
"parent": "global:boomber",
"criteria": {
"trigger": {
"trigger": "minecraft:tick"
Expand Down
Original file line number Diff line number Diff line change
@@ -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
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
Original file line number Diff line number Diff line change
@@ -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
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
Original file line number Diff line number Diff line change
@@ -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
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
Original file line number Diff line number Diff line change
@@ -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
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
Original file line number Diff line number Diff line change
@@ -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
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
Original file line number Diff line number Diff line change
@@ -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
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
Original file line number Diff line number Diff line change
@@ -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
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
Original file line number Diff line number Diff line change
@@ -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
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
Loading

0 comments on commit 642675a

Please sign in to comment.