Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improved readability in setuptargets + misc. fixes #13

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improved readability in setuptargets + misc. fixes #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
550f2f1
setuptargets made more readable
MalbaCato Jul 25, 2020
9bbc7ae
Removed some unused sacrifice item checks
MalbaCato Jul 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions datapacks/Chosen/data/praise/functions/assignid.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Assign a new unique id to an entity with the tag New

scoreboard players add $Next SacrificeID 0
scoreboard players operation @e[tag=New,limit=1] SacrificeID = $Next SacrificeID
tag @e[tag=New,limit=1] remove New

scoreboard players add $Next SacrificeID 1
scoreboard players add @e[tag=New] SacrificeID 1
tag @s remove New

2 changes: 1 addition & 1 deletion datapacks/Chosen/data/praise/functions/menu.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Display a startup menu

tellraw @s ["\n"]
tellraw @s [{"text":"Welcome to "},{"text":"Chosen","color":"gold"},{"text":" version "},{"text":"1.2","color":"gold"},{"text":" by "},{"text":"slicedlime","color":"green","clickEvent":{"action":"open_url","value":"https://www.youtube.com/slicedlime"}}]
tellraw @s [{"text":"Welcome to "},{"text":"Chosen","color":"gold"},{"text":" version "},{"text":"1.3","color":"gold"},{"text":" by "},{"text":"slicedlime","color":"green","clickEvent":{"action":"open_url","value":"https://www.youtube.com/slicedlime"}}]
tellraw @s [""]
tellraw @s ["Game options:"]
tellraw @s [{"text":"- "},{"text":"[","color":"gold","bold": true},{"text":"Game Rules", "color":"green","clickEvent":{"action":"run_command", "value":"/trigger SacrificeMenu set 1"}},{"text":"]","color":"gold", "bold": true}]
Expand Down
14 changes: 0 additions & 14 deletions datapacks/Chosen/data/praise/functions/sacrifice.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ execute if entity @e[tag=Current,tag=CookedPorkchop] at @e[tag=Main] run tag @e[
execute if entity @e[tag=Current,tag=CookedMutton] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:cooked_mutton"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=CookedChicken] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:cooked_chicken"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=FlowerPot] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:flower_pot"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=GlassBottle] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:glass_bottle"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=SeaGrass] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:seagrass"},OnGround:1b}] add Accepted

execute if entity @e[tag=Current,tag=String] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:string"},OnGround:1b}] add Accepted
Expand All @@ -42,7 +41,6 @@ execute if entity @e[tag=Current,tag=Bed] at @e[tag=Main] run tag @e[type=item,d
execute if entity @e[tag=Current,tag=Bed] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:green_bed"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=Bed] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:red_bed"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=Bed] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:black_bed"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=Fern] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:fern"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=MushroomStew] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:mushroom_stew"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=Bread] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:bread"},OnGround:1b}] add Accepted

Expand All @@ -60,10 +58,7 @@ execute if entity @e[tag=Current,tag=RabbitStew] at @e[tag=Main] run tag @e[type
execute if entity @e[tag=Current,tag=FermentedEye] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:fermented_spider_eye"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=MagmaBlock] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:magma_block"},OnGround:1b}] add Accepted

execute if entity @e[tag=Current,tag=Clownfish] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:tropical_fish"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=Clownfish] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:tropical_fish_bucket"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=GlowstoneBlock] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:glowstone"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=PoisonousPotato] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:poisonous_potato"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=SnowBlock] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:snow_block"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=BookAndQuill] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:writable_book"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=FireworkRocket] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:firework_rocket"},OnGround:1b}] add Accepted
Expand All @@ -83,12 +78,9 @@ execute if entity @e[tag=Current,tag=Anvil] at @e[tag=Main] run tag @e[type=item
execute if entity @e[tag=Current,tag=BlazeRod] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:blaze_rod"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=GildedBlackstone] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:gilded_blackstone"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=Shroomlight] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:shroomlight"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=Prismarine] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:prismarine_crystals"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=Diamond] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:diamond"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=Jukebox] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:jukebox"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=FireCharge] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:fire_charge"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=NautilusShell] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:nautilus_shell"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=NetherWartBlock] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:nether_wart_block"},OnGround:1b}] add Accepted

execute if entity @e[tag=Current,tag=MusicDisc] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:music_disc_13"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=MusicDisc] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:music_disc_cat"},OnGround:1b}] add Accepted
Expand Down Expand Up @@ -121,12 +113,6 @@ execute if entity @e[tag=Current,tag=MagmaCream] at @e[tag=Main] run tag @e[type
execute if entity @e[tag=Current,tag=EndCrystal] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:end_crystal"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=PillagerBanner] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:white_banner",tag:{BlockEntityTag:{Patterns:[{Color:9,Pattern:"mr"},{Color:8,Pattern:"bs"},{Color:7,Pattern:"cs"},{Color:8,Pattern:"bo"},{Color:15,Pattern:"ms"},{Color:8,Pattern:"hh"},{Color:8,Pattern:"mc"},{Color:15,Pattern:"bo"}]}}},OnGround:1b}] add Accepted

execute if entity @e[tag=Current,tag=BannerPattern] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:flower_banner_pattern"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=BannerPattern] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:creeper_banner_pattern"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=BannerPattern] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:skull_banner_pattern"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=BannerPattern] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:mojang_banner_pattern"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=BannerPattern] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:globe_banner_pattern"},OnGround:1b}] add Accepted

execute if entity @e[tag=Current,tag=DragonsBreath] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:dragon_breath"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=XPBottle] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:experience_bottle"},OnGround:1b}] add Accepted
execute if entity @e[tag=Current,tag=ChorusFruit] at @e[tag=Main] run tag @e[type=item,distance=..2,nbt={Item:{id:"minecraft:chorus_fruit"},OnGround:1b}] add Accepted
Expand Down
Loading