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 d785bf5 commit 60473da
Show file tree
Hide file tree
Showing 29 changed files with 80 additions and 83 deletions.
18 changes: 0 additions & 18 deletions data/boomber/advancements/boomber.json
View file

This file was deleted.

17 changes: 17 additions & 0 deletions data/boomber/advancements/double_door.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"display": {
"title": "Double Door",
"description": "Opening door is now twice as efficient!",
"icon": {
"item": "minecraft:oak_door"
},
"announce_to_chat": false,
"show_toast": false
},
"parent": "global:boomber",
"criteria": {
"trigger": {
"trigger": "minecraft:tick"
}
}
}
17 changes: 0 additions & 17 deletions data/boomber/advancements/double_door/double_door.json
View file

This file was deleted.

1 change: 0 additions & 1 deletion data/boomber/functions/double_door/door/main.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
function boomber:double_door/door/state

function boomber:double_door/door/update

execute unless block ~ ~ ~ #boomber:double_door/doors run function boomber:double_door/door/remove
2 changes: 1 addition & 1 deletion data/boomber/functions/double_door/door/spawn.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
summon area_effect_cloud ~ ~ ~ {Tags: ["boomber.double_door.door", "boomber.double_door.close", "boomber.double_door.door.spawn"], Age: 0, Duration: 10}
summon area_effect_cloud ~ ~ ~ {Tags: ["boomber.double_door.door", "boomber.double_door.close", "boomber.double_door.door.spawn", "global.ignore", "global.ignore.pos", "global.ignore.kill", "global.ignore.gui"], Age: 0, Duration: 10}
execute as @e[type=area_effect_cloud, tag=boomber.double_door.door.spawn] run function boomber:double_door/door/spawn/type
execute as @e[type=area_effect_cloud, tag=boomber.double_door.door.spawn] run function boomber:double_door/door/spawn/post_update
2 changes: 1 addition & 1 deletion data/boomber/functions/double_door/event/find/acacia_door.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
execute align xyz positioned ~0.5 ~0.5 ~0.5 if block ~ ~ ~ minecraft:acacia_door[half=lower] unless entity @e[type=area_effect_cloud, tag=boomber.double_door.door, distance=..0.3] run function boomber:double_door/event/found/acacia_door
execute as @s[distance=..5] if score @s bb.success matches 0 anchored feet positioned ^ ^ ^0.1 run function boomber:double_door/event/find/acacia_door
execute as @s[distance=..5] if score #raycast bb.dd.var matches 0 anchored feet positioned ^ ^ ^0.1 run function boomber:double_door/event/find/acacia_door
2 changes: 1 addition & 1 deletion data/boomber/functions/double_door/event/find/birch_door.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
execute align xyz positioned ~0.5 ~0.5 ~0.5 if block ~ ~ ~ minecraft:birch_door[half=lower] unless entity @e[type=area_effect_cloud, tag=boomber.double_door.door, distance=..0.3] run function boomber:double_door/event/found/birch_door
execute as @s[distance=..5] if score @s bb.success matches 0 anchored feet positioned ^ ^ ^0.1 run function boomber:double_door/event/find/birch_door
execute as @s[distance=..5] if score #raycast bb.dd.var matches 0 anchored feet positioned ^ ^ ^0.1 run function boomber:double_door/event/find/birch_door
2 changes: 1 addition & 1 deletion data/boomber/functions/double_door/event/find/dark_oak_door.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
execute align xyz positioned ~0.5 ~0.5 ~0.5 if block ~ ~ ~ minecraft:dark_oak_door[half=lower] unless entity @e[type=area_effect_cloud, tag=boomber.double_door.door, distance=..0.3] run function boomber:double_door/event/found/dark_oak_door
execute as @s[distance=..5] if score @s bb.success matches 0 anchored feet positioned ^ ^ ^0.1 run function boomber:double_door/event/find/dark_oak_door
execute as @s[distance=..5] if score #raycast bb.dd.var matches 0 anchored feet positioned ^ ^ ^0.1 run function boomber:double_door/event/find/dark_oak_door
2 changes: 1 addition & 1 deletion data/boomber/functions/double_door/event/find/iron_door.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
execute align xyz positioned ~0.5 ~0.5 ~0.5 if block ~ ~ ~ minecraft:iron_door[half=lower] unless entity @e[type=area_effect_cloud, tag=boomber.double_door.door, distance=..0.3] run function boomber:double_door/event/found/iron_door
execute as @s[distance=..5] if score @s bb.success matches 0 anchored feet positioned ^ ^ ^0.1 run function boomber:double_door/event/find/iron_door
execute as @s[distance=..5] if score #raycast bb.dd.var matches 0 anchored feet positioned ^ ^ ^0.1 run function boomber:double_door/event/find/iron_door
2 changes: 1 addition & 1 deletion data/boomber/functions/double_door/event/find/jungle_door.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
execute align xyz positioned ~0.5 ~0.5 ~0.5 if block ~ ~ ~ minecraft:jungle_door[half=lower] unless entity @e[type=area_effect_cloud, tag=boomber.double_door.door, distance=..0.3] run function boomber:double_door/event/found/jungle_door
execute as @s[distance=..5] if score @s bb.success matches 0 anchored feet positioned ^ ^ ^0.1 run function boomber:double_door/event/find/jungle_door
execute as @s[distance=..5] if score #raycast bb.dd.var matches 0 anchored feet positioned ^ ^ ^0.1 run function boomber:double_door/event/find/jungle_door
2 changes: 1 addition & 1 deletion data/boomber/functions/double_door/event/find/oak_door.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
execute align xyz positioned ~0.5 ~0.5 ~0.5 if block ~ ~ ~ minecraft:oak_door[half=lower] unless entity @e[type=area_effect_cloud, tag=boomber.double_door.door, distance=..0.3] run function boomber:double_door/event/found/oak_door
execute as @s[distance=..5] if score @s bb.success matches 0 anchored feet positioned ^ ^ ^0.1 run function boomber:double_door/event/find/oak_door
execute as @s[distance=..5] if score #raycast bb.dd.var matches 0 anchored feet positioned ^ ^ ^0.1 run function boomber:double_door/event/find/oak_door
2 changes: 1 addition & 1 deletion data/boomber/functions/double_door/event/find/spruce_door.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
execute align xyz positioned ~0.5 ~0.5 ~0.5 if block ~ ~ ~ minecraft:spruce_door[half=lower] unless entity @e[type=area_effect_cloud, tag=boomber.double_door.door, distance=..0.3] run function boomber:double_door/event/found/spruce_door
execute as @s[distance=..5] if score @s bb.success matches 0 anchored feet positioned ^ ^ ^0.1 run function boomber:double_door/event/find/spruce_door
execute as @s[distance=..5] if score #raycast bb.dd.var matches 0 anchored feet positioned ^ ^ ^0.1 run function boomber:double_door/event/find/spruce_door
2 changes: 1 addition & 1 deletion data/boomber/functions/double_door/event/found/acacia_door.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
function boomber:double_door/door/spawn

scoreboard players set @s bb.success 1
scoreboard players set #raycast bb.dd.var 1
2 changes: 1 addition & 1 deletion data/boomber/functions/double_door/event/found/birch_door.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
function boomber:double_door/door/spawn

scoreboard players set @s bb.success 1
scoreboard players set #raycast bb.dd.var 1
2 changes: 1 addition & 1 deletion data/boomber/functions/double_door/event/found/dark_oak_door.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
function boomber:double_door/door/spawn

scoreboard players set @s bb.success 1
scoreboard players set #raycast bb.dd.var 1
2 changes: 1 addition & 1 deletion data/boomber/functions/double_door/event/found/iron_door.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
function boomber:double_door/door/spawn

scoreboard players set @s bb.success 1
scoreboard players set #raycast bb.dd.var 1
2 changes: 1 addition & 1 deletion data/boomber/functions/double_door/event/found/jungle_door.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
function boomber:double_door/door/spawn

scoreboard players set @s bb.success 1
scoreboard players set #raycast bb.dd.var 1
2 changes: 1 addition & 1 deletion data/boomber/functions/double_door/event/found/oak_door.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
function boomber:double_door/door/spawn

scoreboard players set @s bb.success 1
scoreboard players set #raycast bb.dd.var 1
2 changes: 1 addition & 1 deletion data/boomber/functions/double_door/event/found/spruce_door.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
function boomber:double_door/door/spawn

scoreboard players set @s bb.success 1
scoreboard players set #raycast bb.dd.var 1
4 changes: 2 additions & 2 deletions data/boomber/functions/double_door/event/place/acacia_door.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
scoreboard players set @s bb.success 0
execute as @s at @s anchored eyes positioned ^ ^ ^0.1 run function boomber:double_door/event/find/acacia_door
scoreboard players set #raycast bb.dd.var 0
execute as @s[tag=!global.ignore] at @s anchored eyes positioned ^ ^ ^0.1 run function boomber:double_door/event/find/acacia_door

advancement revoke @s from boomber:double_door/event/root
4 changes: 2 additions & 2 deletions data/boomber/functions/double_door/event/place/birch_door.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
scoreboard players set @s bb.success 0
execute as @s at @s anchored eyes positioned ^ ^ ^0.1 run function boomber:double_door/event/find/birch_door
scoreboard players set #raycast bb.dd.var 0
execute as @s[tag=!global.ignore] at @s anchored eyes positioned ^ ^ ^0.1 run function boomber:double_door/event/find/birch_door

advancement revoke @s from boomber:double_door/event/root
4 changes: 2 additions & 2 deletions data/boomber/functions/double_door/event/place/dark_oak_door.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
scoreboard players set @s bb.success 0
execute as @s at @s anchored eyes positioned ^ ^ ^0.1 run function boomber:double_door/event/find/dark_oak_door
scoreboard players set #raycast bb.dd.var 0
execute as @s[tag=!global.ignore] at @s anchored eyes positioned ^ ^ ^0.1 run function boomber:double_door/event/find/dark_oak_door

advancement revoke @s from boomber:double_door/event/root
4 changes: 2 additions & 2 deletions data/boomber/functions/double_door/event/place/iron_door.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
scoreboard players set @s bb.success 0
execute as @s at @s anchored eyes positioned ^ ^ ^0.1 run function boomber:double_door/event/find/iron_door
scoreboard players set #raycast bb.dd.var 0
execute as @s[tag=!global.ignore] at @s anchored eyes positioned ^ ^ ^0.1 run function boomber:double_door/event/find/iron_door

advancement revoke @s from boomber:double_door/event/root
4 changes: 2 additions & 2 deletions data/boomber/functions/double_door/event/place/jungle_door.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
scoreboard players set @s bb.success 0
execute as @s at @s anchored eyes positioned ^ ^ ^0.1 run function boomber:double_door/event/find/jungle_door
scoreboard players set #raycast bb.dd.var 0
execute as @s[tag=!global.ignore] at @s anchored eyes positioned ^ ^ ^0.1 run function boomber:double_door/event/find/jungle_door

advancement revoke @s from boomber:double_door/event/root
4 changes: 2 additions & 2 deletions data/boomber/functions/double_door/event/place/oak_door.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
scoreboard players set @s bb.success 0
execute as @s at @s anchored eyes positioned ^ ^ ^0.1 run function boomber:double_door/event/find/oak_door
scoreboard players set #raycast bb.dd.var 0
execute as @s[tag=!global.ignore] at @s anchored eyes positioned ^ ^ ^0.1 run function boomber:double_door/event/find/oak_door

advancement revoke @s from boomber:double_door/event/root
4 changes: 2 additions & 2 deletions data/boomber/functions/double_door/event/place/spruce_door.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
scoreboard players set @s bb.success 0
execute as @s at @s anchored eyes positioned ^ ^ ^0.1 run function boomber:double_door/event/find/spruce_door
scoreboard players set #raycast bb.dd.var 0
execute as @s[tag=!global.ignore] at @s anchored eyes positioned ^ ^ ^0.1 run function boomber:double_door/event/find/spruce_door

advancement revoke @s from boomber:double_door/event/root
4 changes: 1 addition & 3 deletions data/boomber/functions/double_door/setup.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
scoreboard objectives add bb.variable dummy
scoreboard objectives add bb.calculation dummy
scoreboard objectives add bb.success dummy
scoreboard objectives add bb.dd.var dummy
18 changes: 18 additions & 0 deletions data/global/advancements/boomber.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"display": {
"title": "Boomber",
"description": "",
"icon": {
"item": "minecraft:player_head",
"nbt": "{SkullOwner: 'Boomber'}"
},
"show_toast": false,
"announce_to_chat": false
},
"parent": "global:root",
"criteria": {
"trigger": {
"trigger": "minecraft:tick"
}
}
}
30 changes: 15 additions & 15 deletions data/global/advancements/root.json
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"display": {
"title": "Installed Datapacks",
"description": "",
"icon": {
"item": "minecraft:knowledge_book"
},
"background": "minecraft:textures/block/black_concrete_powder.png",
"show_toast": false,
"announce_to_chat": false
},
"criteria": {
"trigger": {
"trigger": "minecraft:tick"
}
}
"display": {
"title": "Installed Datapacks",
"description": "",
"icon": {
"item": "minecraft:knowledge_book"
},
"background": "minecraft:textures/block/black_concrete_powder.png",
"show_toast": false,
"announce_to_chat": false
},
"criteria": {
"trigger": {
"trigger": "minecraft:tick"
}
}
}

0 comments on commit 60473da

Please sign in to comment.