From e5fc0afed18acb3e8df61a27f428f8b4923b5b14 Mon Sep 17 00:00:00 2001 From: benamaurer Date: Tue, 18 May 2021 13:08:12 -0500 Subject: [PATCH] *Updating in preparation for Canopy launch and 1.17 changes.* Updates: - Changed main directory name from data/birbmc to data/canopy - Changed naming conventions from birbmc to canopy - Fixing y-level coordinates for criteria affected by 1.17 y coordinate changes - Changed advancement icon and background (now jungle sapling and lime concrete) - Fixed typo in parrot_trigger.mcfunction - Removed .DS_Store - Added .gitignore --- data/.DS_Store | Bin 6148 -> 6148 bytes data/birbmc/functions/parrot.mcfunction | 2 -- data/{birbmc => canopy}/.DS_Store | Bin 6148 -> 6148 bytes .../advancements/a_good_start.json | 2 +- data/{birbmc => canopy}/advancements/end.json | 2 +- .../advancements/enter_the_void.json | 2 +- .../advancements/feeling_caged_in.json | 2 +- .../advancements/get_sed.json | 2 +- .../advancements/gib_sed.json | 2 +- .../advancements/good_riddance.json | 2 +- .../is_it_extra_hot_down_there.json | 2 +- .../{birbmc => canopy}/advancements/mobs.json | 2 +- .../advancements/now_were_talking.json | 2 +- .../advancements/okay_too_far.json | 2 +- .../advancements/party_parrot.json | 2 +- .../advancements/party_parrot_trigger.json | 4 ++-- .../{birbmc => canopy}/advancements/root.json | 10 +++++----- .../so_anyway_i_started_blasting.json | 2 +- .../advancements/sword_go_brrr.json | 2 +- .../advancements/the_prized_sed.json | 2 +- .../advancements/till_death_do_us_part.json | 2 +- .../advancements/touch_the_sky.json | 2 +- .../advancements/vaks_living_room.json | 2 +- .../advancements/who_needs_sleep_anyway.json | 2 +- .../{birbmc => canopy}/advancements/yeet.json | 2 +- .../advancements/yggdrasil.json | 0 .../you_shouldnt_be_down_here.json | 2 +- data/canopy/functions/parrot.mcfunction | 2 ++ data/landmarks/.DS_Store | Bin 6148 -> 6148 bytes 29 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 data/birbmc/functions/parrot.mcfunction rename data/{birbmc => canopy}/.DS_Store (73%) rename data/{birbmc => canopy}/advancements/a_good_start.json (90%) rename data/{birbmc => canopy}/advancements/end.json (89%) rename data/{birbmc => canopy}/advancements/enter_the_void.json (91%) rename data/{birbmc => canopy}/advancements/feeling_caged_in.json (94%) rename data/{birbmc => canopy}/advancements/get_sed.json (90%) rename data/{birbmc => canopy}/advancements/gib_sed.json (89%) rename data/{birbmc => canopy}/advancements/good_riddance.json (86%) rename data/{birbmc => canopy}/advancements/is_it_extra_hot_down_there.json (89%) rename data/{birbmc => canopy}/advancements/mobs.json (88%) rename data/{birbmc => canopy}/advancements/now_were_talking.json (92%) rename data/{birbmc => canopy}/advancements/okay_too_far.json (89%) rename data/{birbmc => canopy}/advancements/party_parrot.json (85%) rename data/{birbmc => canopy}/advancements/party_parrot_trigger.json (93%) rename data/{birbmc => canopy}/advancements/root.json (54%) rename data/{birbmc => canopy}/advancements/so_anyway_i_started_blasting.json (92%) rename data/{birbmc => canopy}/advancements/sword_go_brrr.json (88%) rename data/{birbmc => canopy}/advancements/the_prized_sed.json (89%) rename data/{birbmc => canopy}/advancements/till_death_do_us_part.json (96%) rename data/{birbmc => canopy}/advancements/touch_the_sky.json (90%) rename data/{birbmc => canopy}/advancements/vaks_living_room.json (96%) rename data/{birbmc => canopy}/advancements/who_needs_sleep_anyway.json (91%) rename data/{birbmc => canopy}/advancements/yeet.json (91%) rename data/{birbmc => canopy}/advancements/yggdrasil.json (100%) rename data/{birbmc => canopy}/advancements/you_shouldnt_be_down_here.json (89%) create mode 100644 data/canopy/functions/parrot.mcfunction diff --git a/data/.DS_Store b/data/.DS_Store index e89deb8cef1ae763afe235c8c99b715591a5281f..c7478ece249a2d6fd471fee75539da434f819af8 100644 GIT binary patch delta 129 zcmZoMXfc=&$y~rtxiMxdGj}pWB10ZSJ_C?HS%yVX9EqP)UR;orlb^)Ez;JAG4{HOn xXm#~uK{h4EX_No3$O}#finB2wsh_OF8qbJDCFAtXA#9r&CpNHbX6N|J4*)W4B^m$# delta 130 zcmZoMXfc=&$(+lOyfJ1gGj|e0CPNWJ5(AJwS%yVX9EqP)UR;orlb^)Ez;I%67i$Bn vcy+b8(PUmWCB_+(4cO!bX98u|fO-)oXtBmKVpYpHb8`UOX2#9z9Dn%%=$j(j diff --git a/data/birbmc/functions/parrot.mcfunction b/data/birbmc/functions/parrot.mcfunction deleted file mode 100644 index 7633a65..0000000 --- a/data/birbmc/functions/parrot.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -#checking if a parrot is withing radius of the player to determine if the parrot will be dancing -execute as @s at @s if entity @e[type=minecraft:parrot, distance=..2] run advancement grant @s only birbmc:party_parrot diff --git a/data/birbmc/.DS_Store b/data/canopy/.DS_Store similarity index 73% rename from data/birbmc/.DS_Store rename to data/canopy/.DS_Store index 6783d23c5ac432b14b83a266e33d50d7355bda9b..1a192585c2d3baebcba4b1b391ce82aba62e1e2f 100644 GIT binary patch literal 6148 zcmeHK!A{&T5FNu7oYJa$pen~)kb2;-^g^quQnaN9Zk2-Q0V+tywnPds+GJU^+pY2y z@D2P3ztGPqZ^kYHcIk1|B9AolCiXmAeoE|^h*WowtrNA0NW&Rhj}fLA_p?vfoNHMC zDjB1sL+a5nyqu`^4PF7Sz`v#df4fg8p^Q!uZ+^cuRa=EQObe5uhBt_}@Rz^Eko|?1 z4yzN#yG&1tysA5$Uutf?^=M&HYrUkO>d*0!8OC)|52|j`-{q%|Nqv;MeA}4fI#1G_ zyf@r$FTXcso#bV&FXTMyp=9qCJzu~2NHo+2aT!~knX#>qS^GL!vS`8UsG%VXTEz`@S4vEer3W_AvK j4xrM_f*jwOC-aNwaxyY7FdP74hRHTO(wk#MmM{YVN(U3G diff --git a/data/birbmc/advancements/a_good_start.json b/data/canopy/advancements/a_good_start.json similarity index 90% rename from data/birbmc/advancements/a_good_start.json rename to data/canopy/advancements/a_good_start.json index fd5222e..7abfd58 100644 --- a/data/birbmc/advancements/a_good_start.json +++ b/data/canopy/advancements/a_good_start.json @@ -8,7 +8,7 @@ "frame": "task", "announce_to_chat": true }, - "parent": "birbmc:mobs", + "parent": "canopy:mobs", "criteria": { "have_sed": { "trigger": "minecraft:player_killed_entity", diff --git a/data/birbmc/advancements/end.json b/data/canopy/advancements/end.json similarity index 89% rename from data/birbmc/advancements/end.json rename to data/canopy/advancements/end.json index ae61d2e..3a5782e 100644 --- a/data/birbmc/advancements/end.json +++ b/data/canopy/advancements/end.json @@ -9,7 +9,7 @@ "show_toast": false, "announce_to_chat": false }, - "parent": "birbmc:root", + "parent": "canopy:root", "criteria": { "in_end": { "trigger": "minecraft:location", diff --git a/data/birbmc/advancements/enter_the_void.json b/data/canopy/advancements/enter_the_void.json similarity index 91% rename from data/birbmc/advancements/enter_the_void.json rename to data/canopy/advancements/enter_the_void.json index c521a37..618b5e6 100644 --- a/data/birbmc/advancements/enter_the_void.json +++ b/data/canopy/advancements/enter_the_void.json @@ -8,7 +8,7 @@ "frame": "task", "announce_to_chat": true }, - "parent": "birbmc:end", + "parent": "canopy:end", "criteria": { "height": { "trigger": "minecraft:location", diff --git a/data/birbmc/advancements/feeling_caged_in.json b/data/canopy/advancements/feeling_caged_in.json similarity index 94% rename from data/birbmc/advancements/feeling_caged_in.json rename to data/canopy/advancements/feeling_caged_in.json index e1920d8..c7108be 100644 --- a/data/birbmc/advancements/feeling_caged_in.json +++ b/data/canopy/advancements/feeling_caged_in.json @@ -8,7 +8,7 @@ "frame": "challenge", "announce_to_chat": true }, - "parent": "birbmc:root", + "parent": "canopy:root", "criteria": { "x+": { "trigger": "minecraft:location", diff --git a/data/birbmc/advancements/get_sed.json b/data/canopy/advancements/get_sed.json similarity index 90% rename from data/birbmc/advancements/get_sed.json rename to data/canopy/advancements/get_sed.json index c97999e..ddaef9f 100644 --- a/data/birbmc/advancements/get_sed.json +++ b/data/canopy/advancements/get_sed.json @@ -8,7 +8,7 @@ "frame": "task", "announce_to_chat": true }, - "parent": "birbmc:root", + "parent": "canopy:root", "criteria": { "have_sed": { "trigger": "minecraft:inventory_changed", diff --git a/data/birbmc/advancements/gib_sed.json b/data/canopy/advancements/gib_sed.json similarity index 89% rename from data/birbmc/advancements/gib_sed.json rename to data/canopy/advancements/gib_sed.json index 87e094f..6f85f4e 100644 --- a/data/birbmc/advancements/gib_sed.json +++ b/data/canopy/advancements/gib_sed.json @@ -8,7 +8,7 @@ "frame": "task", "announce_to_chat": true }, - "parent": "birbmc:get_sed", + "parent": "canopy:get_sed", "criteria": { "have_sed": { "trigger": "minecraft:tame_animal", diff --git a/data/birbmc/advancements/good_riddance.json b/data/canopy/advancements/good_riddance.json similarity index 86% rename from data/birbmc/advancements/good_riddance.json rename to data/canopy/advancements/good_riddance.json index 681e16d..0c2a075 100644 --- a/data/birbmc/advancements/good_riddance.json +++ b/data/canopy/advancements/good_riddance.json @@ -8,7 +8,7 @@ "frame": "task", "announce_to_chat": true }, - "parent": "birbmc:so_anyway_i_started_blasting", + "parent": "canopy:so_anyway_i_started_blasting", "criteria": { "have_sed": { "trigger": "minecraft:player_killed_entity", diff --git a/data/birbmc/advancements/is_it_extra_hot_down_there.json b/data/canopy/advancements/is_it_extra_hot_down_there.json similarity index 89% rename from data/birbmc/advancements/is_it_extra_hot_down_there.json rename to data/canopy/advancements/is_it_extra_hot_down_there.json index 4c787bf..3bf2e52 100644 --- a/data/birbmc/advancements/is_it_extra_hot_down_there.json +++ b/data/canopy/advancements/is_it_extra_hot_down_there.json @@ -9,7 +9,7 @@ "hidden": false, "announce_to_chat": true }, - "parent": "birbmc:enter_the_void", + "parent": "canopy:enter_the_void", "criteria": { "height": { "trigger": "minecraft:location", diff --git a/data/birbmc/advancements/mobs.json b/data/canopy/advancements/mobs.json similarity index 88% rename from data/birbmc/advancements/mobs.json rename to data/canopy/advancements/mobs.json index 8dfbc92..5914837 100644 --- a/data/birbmc/advancements/mobs.json +++ b/data/canopy/advancements/mobs.json @@ -9,7 +9,7 @@ "show_toast": false, "announce_to_chat": false }, - "parent": "birbmc:root", + "parent": "canopy:root", "criteria": { "mob_kill": { "trigger": "minecraft:player_killed_entity" diff --git a/data/birbmc/advancements/now_were_talking.json b/data/canopy/advancements/now_were_talking.json similarity index 92% rename from data/birbmc/advancements/now_were_talking.json rename to data/canopy/advancements/now_were_talking.json index 60516ce..aafa489 100644 --- a/data/birbmc/advancements/now_were_talking.json +++ b/data/canopy/advancements/now_were_talking.json @@ -8,7 +8,7 @@ "frame": "task", "announce_to_chat": true }, - "parent": "birbmc:a_good_start", + "parent": "canopy:a_good_start", "criteria": { "100_phantoms": { "trigger": "minecraft:location", diff --git a/data/birbmc/advancements/okay_too_far.json b/data/canopy/advancements/okay_too_far.json similarity index 89% rename from data/birbmc/advancements/okay_too_far.json rename to data/canopy/advancements/okay_too_far.json index d4e21ba..3635756 100644 --- a/data/birbmc/advancements/okay_too_far.json +++ b/data/canopy/advancements/okay_too_far.json @@ -9,7 +9,7 @@ "frame": "challenge", "announce_to_chat": true }, - "parent": "birbmc:touch_the_sky", + "parent": "canopy:touch_the_sky", "criteria": { "height": { "trigger": "minecraft:location", diff --git a/data/birbmc/advancements/party_parrot.json b/data/canopy/advancements/party_parrot.json similarity index 85% rename from data/birbmc/advancements/party_parrot.json rename to data/canopy/advancements/party_parrot.json index 9105407..0e79130 100644 --- a/data/birbmc/advancements/party_parrot.json +++ b/data/canopy/advancements/party_parrot.json @@ -8,7 +8,7 @@ "frame": "challenge", "announce_to_chat": true }, - "parent": "birbmc:gib_sed", + "parent": "canopy:gib_sed", "criteria": { "birdy_dancin": { "trigger": "impossible" diff --git a/data/birbmc/advancements/party_parrot_trigger.json b/data/canopy/advancements/party_parrot_trigger.json similarity index 93% rename from data/birbmc/advancements/party_parrot_trigger.json rename to data/canopy/advancements/party_parrot_trigger.json index 9d07520..b744d7b 100644 --- a/data/birbmc/advancements/party_parrot_trigger.json +++ b/data/canopy/advancements/party_parrot_trigger.json @@ -1,5 +1,5 @@ { - "parent": "birbmc:root", + "parent": "canopy:root", "criteria": { "music_disc_cat": { "trigger": "minecraft:item_used_on_block", @@ -228,6 +228,6 @@ ] ], "rewards": { - "function": "birbmc:parrot" + "function": "canopy:parrot" } } diff --git a/data/birbmc/advancements/root.json b/data/canopy/advancements/root.json similarity index 54% rename from data/birbmc/advancements/root.json rename to data/canopy/advancements/root.json index 51bb8de..462687f 100644 --- a/data/birbmc/advancements/root.json +++ b/data/canopy/advancements/root.json @@ -1,12 +1,12 @@ -{ +l{ "display": { "icon": { - "item": "minecraft:feather" + "item": "minecraft:jungle_sapling" }, - "title": "BirbMC", - "description": "beep", + "title": "Canopy", + "description": "Can o' Peas", "frame": "task", - "background": "minecraft:textures/block/light_blue_concrete_powder.png", + "background": "minecraft:textures/block/lime_concrete.png", "show_toast": false, "announce_to_chat": false }, diff --git a/data/birbmc/advancements/so_anyway_i_started_blasting.json b/data/canopy/advancements/so_anyway_i_started_blasting.json similarity index 92% rename from data/birbmc/advancements/so_anyway_i_started_blasting.json rename to data/canopy/advancements/so_anyway_i_started_blasting.json index 85e1995..1068968 100644 --- a/data/birbmc/advancements/so_anyway_i_started_blasting.json +++ b/data/canopy/advancements/so_anyway_i_started_blasting.json @@ -8,7 +8,7 @@ "frame": "task", "announce_to_chat": true }, - "parent": "birbmc:mobs", + "parent": "canopy:mobs", "criteria": { "bow_spam": { "trigger": "minecraft:player_hurt_entity", diff --git a/data/birbmc/advancements/sword_go_brrr.json b/data/canopy/advancements/sword_go_brrr.json similarity index 88% rename from data/birbmc/advancements/sword_go_brrr.json rename to data/canopy/advancements/sword_go_brrr.json index dffa535..daa4e69 100644 --- a/data/birbmc/advancements/sword_go_brrr.json +++ b/data/canopy/advancements/sword_go_brrr.json @@ -8,7 +8,7 @@ "frame": "challenge", "announce_to_chat": true }, - "parent": "birbmc:so_anyway_i_started_blasting", + "parent": "canopy:so_anyway_i_started_blasting", "criteria": { "height": { "trigger": "minecraft:location", diff --git a/data/birbmc/advancements/the_prized_sed.json b/data/canopy/advancements/the_prized_sed.json similarity index 89% rename from data/birbmc/advancements/the_prized_sed.json rename to data/canopy/advancements/the_prized_sed.json index 9fc08af..5f124db 100644 --- a/data/birbmc/advancements/the_prized_sed.json +++ b/data/canopy/advancements/the_prized_sed.json @@ -8,7 +8,7 @@ "frame": "challenge", "announce_to_chat": true }, - "parent": "birbmc:root", + "parent": "canopy:root", "criteria": { "get_award": { "trigger": "minecraft:impossible" diff --git a/data/birbmc/advancements/till_death_do_us_part.json b/data/canopy/advancements/till_death_do_us_part.json similarity index 96% rename from data/birbmc/advancements/till_death_do_us_part.json rename to data/canopy/advancements/till_death_do_us_part.json index 3638897..66cb08c 100644 --- a/data/birbmc/advancements/till_death_do_us_part.json +++ b/data/canopy/advancements/till_death_do_us_part.json @@ -9,7 +9,7 @@ "frame": "task", "announce_to_chat": true }, - "parent": "birbmc:root", + "parent": "canopy:root", "criteria": { "wear_cursed_items": { "trigger": "minecraft:inventory_changed", diff --git a/data/birbmc/advancements/touch_the_sky.json b/data/canopy/advancements/touch_the_sky.json similarity index 90% rename from data/birbmc/advancements/touch_the_sky.json rename to data/canopy/advancements/touch_the_sky.json index 53386f2..36049f0 100644 --- a/data/birbmc/advancements/touch_the_sky.json +++ b/data/canopy/advancements/touch_the_sky.json @@ -8,7 +8,7 @@ "frame": "task", "announce_to_chat": true }, - "parent": "birbmc:root", + "parent": "canopy:root", "criteria": { "height": { "trigger": "minecraft:location", diff --git a/data/birbmc/advancements/vaks_living_room.json b/data/canopy/advancements/vaks_living_room.json similarity index 96% rename from data/birbmc/advancements/vaks_living_room.json rename to data/canopy/advancements/vaks_living_room.json index c897dca..88f7ba2 100644 --- a/data/birbmc/advancements/vaks_living_room.json +++ b/data/canopy/advancements/vaks_living_room.json @@ -9,7 +9,7 @@ "frame": "challenge", "announce_to_chat": true }, - "parent": "birbmc:gib_sed", + "parent": "canopy:gib_sed", "criteria": { "red": { "trigger": "minecraft:tame_animal", diff --git a/data/birbmc/advancements/who_needs_sleep_anyway.json b/data/canopy/advancements/who_needs_sleep_anyway.json similarity index 91% rename from data/birbmc/advancements/who_needs_sleep_anyway.json rename to data/canopy/advancements/who_needs_sleep_anyway.json index 46fd36d..62fe0ef 100644 --- a/data/birbmc/advancements/who_needs_sleep_anyway.json +++ b/data/canopy/advancements/who_needs_sleep_anyway.json @@ -8,7 +8,7 @@ "frame": "challenge", "announce_to_chat": true }, - "parent": "birbmc:now_were_talking", + "parent": "canopy:now_were_talking", "criteria": { "100_phantoms": { "trigger": "minecraft:location", diff --git a/data/birbmc/advancements/yeet.json b/data/canopy/advancements/yeet.json similarity index 91% rename from data/birbmc/advancements/yeet.json rename to data/canopy/advancements/yeet.json index d1c12f7..5161331 100644 --- a/data/birbmc/advancements/yeet.json +++ b/data/canopy/advancements/yeet.json @@ -8,7 +8,7 @@ "frame": "task", "announce_to_chat": true }, - "parent": "birbmc:end", + "parent": "canopy:end", "criteria": { "height": { "trigger": "minecraft:location", diff --git a/data/birbmc/advancements/yggdrasil.json b/data/canopy/advancements/yggdrasil.json similarity index 100% rename from data/birbmc/advancements/yggdrasil.json rename to data/canopy/advancements/yggdrasil.json diff --git a/data/birbmc/advancements/you_shouldnt_be_down_here.json b/data/canopy/advancements/you_shouldnt_be_down_here.json similarity index 89% rename from data/birbmc/advancements/you_shouldnt_be_down_here.json rename to data/canopy/advancements/you_shouldnt_be_down_here.json index 8b6ad50..ad28fa9 100644 --- a/data/birbmc/advancements/you_shouldnt_be_down_here.json +++ b/data/canopy/advancements/you_shouldnt_be_down_here.json @@ -9,7 +9,7 @@ "hidden": false, "announce_to_chat": true }, - "parent": "birbmc:enter_the_void", + "parent": "canopy:enter_the_void", "criteria": { "height": { "trigger": "minecraft:location", diff --git a/data/canopy/functions/parrot.mcfunction b/data/canopy/functions/parrot.mcfunction new file mode 100644 index 0000000..89d06e3 --- /dev/null +++ b/data/canopy/functions/parrot.mcfunction @@ -0,0 +1,2 @@ +#checking if a parrot is within radius of the player to determine if the parrot will be dancing +execute as @s at @s if entity @e[type=minecraft:parrot, distance=..2] run advancement grant @s only canopy:party_parrot diff --git a/data/landmarks/.DS_Store b/data/landmarks/.DS_Store index 56eef646cc612198fcb17c55755c8bdcab0ccc2b..df6ac719d6349d003aba035aa1de821557ff8528 100644 GIT binary patch delta 39 vcmZoMXffDe%*1$XvI$cIvuJho9$81s9U&Fmb1`2kFT B4paaD