From dfa6a6783ed762b9405d9a5959e0db3da9cb66d3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 21 Mar 2019 16:14:14 -0500 Subject: [PATCH] Fix advancements --- .../advancements/challenge/flugel_eye.json | 4 +- .../challenge/gaia_guardian_no_armor.json | 3 +- .../challenge/infinite_fruit.json | 4 +- .../advancements/challenge/king_key.json | 4 +- .../advancements/challenge/l20_shard_use.json | 6 +- .../advancements/challenge/loki_ring.json | 4 +- .../advancements/challenge/odin_ring.json | 4 +- .../advancements/challenge/rank_ss_pick.json | 2 +- .../botania/advancements/challenge/root.json | 2 +- .../challenge/super_corporea_request.json | 2 +- .../advancements/challenge/thor_ring.json | 4 +- .../advancements/main/bauble_wear.json | 2 +- .../advancements/main/brew_pickup.json | 4 +- .../advancements/main/corporea_craft.json | 12 +- .../main/crafting_halo_craft.json | 4 +- .../advancements/main/dirt_rod_craft.json | 4 +- .../advancements/main/elf_portal_open.json | 2 +- .../advancements/main/flower_pickup.json | 3 +- .../advancements/main/gaia_guardian_kill.json | 2 +- .../advancements/main/luminizer_ride.json | 2 +- .../advancements/main/mana_blaster_shoot.json | 4 +- .../advancements/main/mana_bomb_ignite.json | 4 +- .../advancements/main/mana_cart_craft.json | 4 +- .../advancements/main/mana_cookie_eat.json | 4 +- .../advancements/main/mana_pool_pickup.json | 10 +- .../main/manaweave_armor_craft.json | 8 +- .../data/botania/advancements/main/root.json | 2 +- .../advancements/main/rune_pickup.json | 164 +----------------- .../advancements/main/spawner_mover_use.json | 4 +- .../main/terrasteel_weapon_craft.json | 4 +- .../advancements/main/tiara_wings.json | 91 +--------- .../advancements/main/tiny_potato_pet.json | 2 +- .../botania/tags/{ => items}/flowers.json | 0 .../data/botania/tags/items/runes.json | 21 +++ 34 files changed, 89 insertions(+), 307 deletions(-) rename src/main/resources/data/botania/tags/{ => items}/flowers.json (100%) create mode 100644 src/main/resources/data/botania/tags/items/runes.json diff --git a/src/main/resources/data/botania/advancements/challenge/flugel_eye.json b/src/main/resources/data/botania/advancements/challenge/flugel_eye.json index 5dc7ea4c1..672e15184 100644 --- a/src/main/resources/data/botania/advancements/challenge/flugel_eye.json +++ b/src/main/resources/data/botania/advancements/challenge/flugel_eye.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:flugeleye" + "item": "botania:flugel_eye" }, "title": { "translate": "advancement.botania:flugelEye" @@ -17,7 +17,7 @@ "trigger": "botania:relic_bind", "conditions": { "relic": { - "item": "botania:flugeleye" + "item": "botania:flugel_eye" } } } diff --git a/src/main/resources/data/botania/advancements/challenge/gaia_guardian_no_armor.json b/src/main/resources/data/botania/advancements/challenge/gaia_guardian_no_armor.json index ac82dabab..192219557 100644 --- a/src/main/resources/data/botania/advancements/challenge/gaia_guardian_no_armor.json +++ b/src/main/resources/data/botania/advancements/challenge/gaia_guardian_no_armor.json @@ -1,8 +1,7 @@ { "display": { "icon": { - "item": "minecraft:skull", - "data": 3 + "item": "minecraft:player_head" }, "title": { "translate": "advancement.botania:gaiaGuardianNoArmor" diff --git a/src/main/resources/data/botania/advancements/challenge/infinite_fruit.json b/src/main/resources/data/botania/advancements/challenge/infinite_fruit.json index 8d28d119b..0545bdea4 100644 --- a/src/main/resources/data/botania/advancements/challenge/infinite_fruit.json +++ b/src/main/resources/data/botania/advancements/challenge/infinite_fruit.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:infinitefruit" + "item": "botania:infinite_fruit" }, "title": { "translate": "advancement.botania:infiniteFruit" @@ -17,7 +17,7 @@ "trigger": "botania:relic_bind", "conditions": { "relic": { - "item": "botania:infinitefruit" + "item": "botania:infinite_fruit" } } } diff --git a/src/main/resources/data/botania/advancements/challenge/king_key.json b/src/main/resources/data/botania/advancements/challenge/king_key.json index 2163cb0f3..734cb44d4 100644 --- a/src/main/resources/data/botania/advancements/challenge/king_key.json +++ b/src/main/resources/data/botania/advancements/challenge/king_key.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:kingkey" + "item": "botania:king_key" }, "title": { "translate": "advancement.botania:kingKey" @@ -17,7 +17,7 @@ "trigger": "botania:relic_bind", "conditions": { "relic": { - "item": "botania:kingkey" + "item": "botania:king_key" } } } diff --git a/src/main/resources/data/botania/advancements/challenge/l20_shard_use.json b/src/main/resources/data/botania/advancements/challenge/l20_shard_use.json index 8738d44b6..b71e2bc11 100644 --- a/src/main/resources/data/botania/advancements/challenge/l20_shard_use.json +++ b/src/main/resources/data/botania/advancements/challenge/l20_shard_use.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:laputashard" + "item": "botania:laputa_shard" }, "title": { "translate": "advancement.botania:l20ShardUse" @@ -17,8 +17,8 @@ "trigger": "botania:use_item_success", "conditions": { "item": { - "item": "botania:laputashard", - "data": 19 + "item": "botania:laputa_shard", + "nbt": "{\"level\": 19}" } } } diff --git a/src/main/resources/data/botania/advancements/challenge/loki_ring.json b/src/main/resources/data/botania/advancements/challenge/loki_ring.json index 5b555f327..29162dc55 100644 --- a/src/main/resources/data/botania/advancements/challenge/loki_ring.json +++ b/src/main/resources/data/botania/advancements/challenge/loki_ring.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:lokiring" + "item": "botania:loki_ring" }, "title": { "translate": "advancement.botania:lokiRing" @@ -17,7 +17,7 @@ "trigger": "botania:relic_bind", "conditions": { "relic": { - "item": "botania:lokiring" + "item": "botania:loki_ring" } } } diff --git a/src/main/resources/data/botania/advancements/challenge/odin_ring.json b/src/main/resources/data/botania/advancements/challenge/odin_ring.json index a1ec3fcb2..e5de0c6d7 100644 --- a/src/main/resources/data/botania/advancements/challenge/odin_ring.json +++ b/src/main/resources/data/botania/advancements/challenge/odin_ring.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:odinring" + "item": "botania:odin_ring" }, "title": { "translate": "advancement.botania:odinRing" @@ -17,7 +17,7 @@ "trigger": "botania:relic_bind", "conditions": { "relic": { - "item": "botania:odinring" + "item": "botania:odin_ring" } } } diff --git a/src/main/resources/data/botania/advancements/challenge/rank_ss_pick.json b/src/main/resources/data/botania/advancements/challenge/rank_ss_pick.json index ded922cf2..84a067078 100644 --- a/src/main/resources/data/botania/advancements/challenge/rank_ss_pick.json +++ b/src/main/resources/data/botania/advancements/challenge/rank_ss_pick.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:terrapick" + "item": "botania:terra_pick" }, "title": { "translate": "advancement.botania:rankSSPick" diff --git a/src/main/resources/data/botania/advancements/challenge/root.json b/src/main/resources/data/botania/advancements/challenge/root.json index b95881022..8dceb609c 100644 --- a/src/main/resources/data/botania/advancements/challenge/root.json +++ b/src/main/resources/data/botania/advancements/challenge/root.json @@ -19,7 +19,7 @@ "conditions": { "items": [ { - "item": "botania:flower" + "tag": "botania:flowers" } ] } diff --git a/src/main/resources/data/botania/advancements/challenge/super_corporea_request.json b/src/main/resources/data/botania/advancements/challenge/super_corporea_request.json index c8cb66a9a..e427ef2a5 100644 --- a/src/main/resources/data/botania/advancements/challenge/super_corporea_request.json +++ b/src/main/resources/data/botania/advancements/challenge/super_corporea_request.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:corporeaindex" + "item": "botania:corporea_index" }, "title": { "translate": "advancement.botania:superCorporeaRequest" diff --git a/src/main/resources/data/botania/advancements/challenge/thor_ring.json b/src/main/resources/data/botania/advancements/challenge/thor_ring.json index d5924799b..98999ffe6 100644 --- a/src/main/resources/data/botania/advancements/challenge/thor_ring.json +++ b/src/main/resources/data/botania/advancements/challenge/thor_ring.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:thorring" + "item": "botania:thor_ring" }, "title": { "translate": "advancement.botania:thorRing" @@ -17,7 +17,7 @@ "trigger": "botania:relic_bind", "conditions": { "relic": { - "item": "botania:thorring" + "item": "botania:thor_ring" } } } diff --git a/src/main/resources/data/botania/advancements/main/bauble_wear.json b/src/main/resources/data/botania/advancements/main/bauble_wear.json index ff98fafa7..efa32ead3 100644 --- a/src/main/resources/data/botania/advancements/main/bauble_wear.json +++ b/src/main/resources/data/botania/advancements/main/bauble_wear.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:manaring" + "item": "botania:mana_ring" }, "title": { "translate": "advancement.botania:baubleWear" diff --git a/src/main/resources/data/botania/advancements/main/brew_pickup.json b/src/main/resources/data/botania/advancements/main/brew_pickup.json index ef3407bb5..2d3c61ead 100644 --- a/src/main/resources/data/botania/advancements/main/brew_pickup.json +++ b/src/main/resources/data/botania/advancements/main/brew_pickup.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "botania:brewflask" + "item": "botania:brew_flask" } ] } @@ -27,7 +27,7 @@ "conditions": { "items": [ { - "item": "botania:brewvial" + "item": "botania:brew_vial" } ] } diff --git a/src/main/resources/data/botania/advancements/main/corporea_craft.json b/src/main/resources/data/botania/advancements/main/corporea_craft.json index 3435d0758..040099fd3 100644 --- a/src/main/resources/data/botania/advancements/main/corporea_craft.json +++ b/src/main/resources/data/botania/advancements/main/corporea_craft.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:corporeacrystalcube" + "item": "botania:corporea_crystal_cube" }, "title": { "translate": "advancement.botania:corporeaCraft" @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "botania:corporeacrystalcube" + "item": "botania:corporea_crystal_cube" } ] } @@ -27,7 +27,7 @@ "conditions": { "items": [ { - "item": "botania:corporeafunnel" + "item": "botania:corporea_funnel" } ] } @@ -37,7 +37,7 @@ "conditions": { "items": [ { - "item": "botania:corporeaindex" + "item": "botania:corporea_index" } ] } @@ -47,7 +47,7 @@ "conditions": { "items": [ { - "item": "botania:corporeainterceptor" + "item": "botania:corporea_interceptor" } ] } @@ -57,7 +57,7 @@ "conditions": { "items": [ { - "item": "botania:corporearetainer" + "item": "botania:corporea_retainer" } ] } diff --git a/src/main/resources/data/botania/advancements/main/crafting_halo_craft.json b/src/main/resources/data/botania/advancements/main/crafting_halo_craft.json index 8144af1c5..650e1a06b 100644 --- a/src/main/resources/data/botania/advancements/main/crafting_halo_craft.json +++ b/src/main/resources/data/botania/advancements/main/crafting_halo_craft.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:craftinghalo" + "item": "botania:crafting_halo" }, "title": { "translate": "advancement.botania:craftingHaloCraft" @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "botania:craftinghalo" + "item": "botania:crafting_halo" } ] } diff --git a/src/main/resources/data/botania/advancements/main/dirt_rod_craft.json b/src/main/resources/data/botania/advancements/main/dirt_rod_craft.json index 7633c45be..8726e3025 100644 --- a/src/main/resources/data/botania/advancements/main/dirt_rod_craft.json +++ b/src/main/resources/data/botania/advancements/main/dirt_rod_craft.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:dirtrod" + "item": "botania:dirt_rod" }, "title": { "translate": "advancement.botania:dirtRodCraft" @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "botania:dirtrod" + "item": "botania:dirt_rod" } ] } diff --git a/src/main/resources/data/botania/advancements/main/elf_portal_open.json b/src/main/resources/data/botania/advancements/main/elf_portal_open.json index 8f162163b..bab1ca042 100644 --- a/src/main/resources/data/botania/advancements/main/elf_portal_open.json +++ b/src/main/resources/data/botania/advancements/main/elf_portal_open.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:alfheimportal" + "item": "botania:alfheim_portal" }, "title": { "translate": "advancement.botania:elfPortalOpen" diff --git a/src/main/resources/data/botania/advancements/main/flower_pickup.json b/src/main/resources/data/botania/advancements/main/flower_pickup.json index 975bfb55f..df3b0b7b1 100644 --- a/src/main/resources/data/botania/advancements/main/flower_pickup.json +++ b/src/main/resources/data/botania/advancements/main/flower_pickup.json @@ -1,8 +1,7 @@ { "display": { "icon": { - "item": "botania:flower", - "data": 6 + "item": "botania:pink_mystical_flower" }, "title": { "translate": "advancement.botania:flowerPickup" diff --git a/src/main/resources/data/botania/advancements/main/gaia_guardian_kill.json b/src/main/resources/data/botania/advancements/main/gaia_guardian_kill.json index ca04e7d1d..194575aad 100644 --- a/src/main/resources/data/botania/advancements/main/gaia_guardian_kill.json +++ b/src/main/resources/data/botania/advancements/main/gaia_guardian_kill.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:gaiahead" + "item": "botania:gaia_head" }, "title": { "translate": "advancement.botania:gaiaGuardianKill" diff --git a/src/main/resources/data/botania/advancements/main/luminizer_ride.json b/src/main/resources/data/botania/advancements/main/luminizer_ride.json index 489ec5901..a4284957b 100644 --- a/src/main/resources/data/botania/advancements/main/luminizer_ride.json +++ b/src/main/resources/data/botania/advancements/main/luminizer_ride.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:lightrelay" + "item": "botania:light_relay" }, "title": { "translate": "advancement.botania:luminizerRide" diff --git a/src/main/resources/data/botania/advancements/main/mana_blaster_shoot.json b/src/main/resources/data/botania/advancements/main/mana_blaster_shoot.json index 317fa276f..fa13bd81e 100644 --- a/src/main/resources/data/botania/advancements/main/mana_blaster_shoot.json +++ b/src/main/resources/data/botania/advancements/main/mana_blaster_shoot.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:managun" + "item": "botania:mana_gun" }, "title": { "translate": "advancement.botania:manaBlasterShoot" @@ -16,7 +16,7 @@ "trigger": "botania:use_item_success", "conditions": { "item": { - "item": "botania:managun" + "item": "botania:mana_gun" } } } diff --git a/src/main/resources/data/botania/advancements/main/mana_bomb_ignite.json b/src/main/resources/data/botania/advancements/main/mana_bomb_ignite.json index 1c842bdca..c94404e0f 100644 --- a/src/main/resources/data/botania/advancements/main/mana_bomb_ignite.json +++ b/src/main/resources/data/botania/advancements/main/mana_bomb_ignite.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:manabomb" + "item": "botania:mana_bomb" }, "title": { "translate": "advancement.botania:manaBombIgnite" @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "botania:manabomb" + "item": "botania:mana_bomb" } ] } diff --git a/src/main/resources/data/botania/advancements/main/mana_cart_craft.json b/src/main/resources/data/botania/advancements/main/mana_cart_craft.json index dd0223c9b..08ad89621 100644 --- a/src/main/resources/data/botania/advancements/main/mana_cart_craft.json +++ b/src/main/resources/data/botania/advancements/main/mana_cart_craft.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:poolminecart" + "item": "botania:pool_minecart" }, "title": { "translate": "advancement.botania:manaCartCraft" @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "botania:poolminecart" + "item": "botania:pool_minecart" } ] } diff --git a/src/main/resources/data/botania/advancements/main/mana_cookie_eat.json b/src/main/resources/data/botania/advancements/main/mana_cookie_eat.json index 96f8683e4..1fa62b3c4 100644 --- a/src/main/resources/data/botania/advancements/main/mana_cookie_eat.json +++ b/src/main/resources/data/botania/advancements/main/mana_cookie_eat.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:manacookie" + "item": "botania:mana_cookie" }, "title": { "translate": "advancement.botania:manaCookieEat" @@ -16,7 +16,7 @@ "trigger": "minecraft:consume_item", "conditions": { "item": { - "item": "botania:manacookie" + "item": "botania:mana_cookie" } } } diff --git a/src/main/resources/data/botania/advancements/main/mana_pool_pickup.json b/src/main/resources/data/botania/advancements/main/mana_pool_pickup.json index 51777bbb1..3f200e2ed 100644 --- a/src/main/resources/data/botania/advancements/main/mana_pool_pickup.json +++ b/src/main/resources/data/botania/advancements/main/mana_pool_pickup.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:pool_default" + "item": "botania:mana_pool" }, "title": { "translate": "advancement.botania:manaPoolPickup" @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "botania:pool_default" + "item": "botania:mana_pool" } ] } @@ -27,7 +27,7 @@ "conditions": { "items": [ { - "item": "botania:pool_creative" + "item": "botania:creative_pool" } ] } @@ -37,7 +37,7 @@ "conditions": { "items": [ { - "item": "botania:pool_diluted" + "item": "botania:diluted_pool" } ] } @@ -47,7 +47,7 @@ "conditions": { "items": [ { - "item": "botania:pool_fabulous" + "item": "botania:fabulous_pool" } ] } diff --git a/src/main/resources/data/botania/advancements/main/manaweave_armor_craft.json b/src/main/resources/data/botania/advancements/main/manaweave_armor_craft.json index c1e532c43..3612fbc1e 100644 --- a/src/main/resources/data/botania/advancements/main/manaweave_armor_craft.json +++ b/src/main/resources/data/botania/advancements/main/manaweave_armor_craft.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "botania:manaweavehelm" + "item": "botania:manaweave_helmet" } ] } @@ -27,7 +27,7 @@ "conditions": { "items": [ { - "item": "botania:manaweavechest" + "item": "botania:manaweave_chestplate" } ] } @@ -37,7 +37,7 @@ "conditions": { "items": [ { - "item": "botania:manaweavelegs" + "item": "botania:manaweave_leggings" } ] } @@ -47,7 +47,7 @@ "conditions": { "items": [ { - "item": "botania:manaweaveboots" + "item": "botania:manaweave_boots" } ] } diff --git a/src/main/resources/data/botania/advancements/main/root.json b/src/main/resources/data/botania/advancements/main/root.json index a2b760905..926e0c8ce 100644 --- a/src/main/resources/data/botania/advancements/main/root.json +++ b/src/main/resources/data/botania/advancements/main/root.json @@ -19,7 +19,7 @@ "conditions": { "items": [ { - "item": "botania:flower" + "tag": "botania:flowers" } ] } diff --git a/src/main/resources/data/botania/advancements/main/rune_pickup.json b/src/main/resources/data/botania/advancements/main/rune_pickup.json index e5f18d38b..d6e5e016e 100644 --- a/src/main/resources/data/botania/advancements/main/rune_pickup.json +++ b/src/main/resources/data/botania/advancements/main/rune_pickup.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:runealtar" + "item": "botania:runic_altar" }, "title": { "translate": "advancement.botania:runePickup" @@ -12,171 +12,15 @@ }, "parent": "botania:main/mana_pool_pickup", "criteria": { - "rune_water": { + "rune": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "item": "botania:rune_water" - } - ] - } - }, - "rune_fire": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:rune_fire" - } - ] - } - }, - "rune_earth": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:rune_earth" - } - ] - } - }, - "rune_air": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:rune_air" - } - ] - } - }, - "rune_spring": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:rune_spring" - } - ] - } - }, - "rune_summer": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:rune_summer" - } - ] - } - }, - "rune_autumn": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:rune_autumn" - } - ] - } - }, - "rune_winter": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:rune_winter" - } - ] - } - }, - "rune_mana": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:rune_mana" - } - ] - } - }, - "rune_lust": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:rune_lust" - } - ] - } - }, - "rune_gluttony": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:rune_gluttony" - } - ] - } - }, - "rune_greed": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:rune_greed" - } - ] - } - }, - "rune_sloth": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:rune_sloth" - } - ] - } - }, - "rune_wrath": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:rune_wrath" - } - ] - } - }, - "rune_envy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:rune_envy" - } - ] - } - }, - "rune_pride": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:rune_pride" + "tag": "botania:runes" } ] } } - }, - "requirements": [ - [ - "rune_water", "rune_fire", "rune_earth", "rune_air", "rune_spring", "rune_summer", "rune_autumn", "rune_winter", - "rune_mana", "rune_lust", "rune_gluttony", "rune_greed", "rune_sloth", "rune_wrath", "rune_envy", "rune_pride" - ] - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/botania/advancements/main/spawner_mover_use.json b/src/main/resources/data/botania/advancements/main/spawner_mover_use.json index 14e21408f..620ab5b80 100644 --- a/src/main/resources/data/botania/advancements/main/spawner_mover_use.json +++ b/src/main/resources/data/botania/advancements/main/spawner_mover_use.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:spawnermover" + "item": "botania:spawner_mover" }, "title": { "translate": "advancement.botania:spawnerMoverUse" @@ -16,7 +16,7 @@ "trigger": "botania:use_item_success", "conditions": { "item": { - "item": "botania:spawnermover" + "item": "botania:spawner_mover" } } } diff --git a/src/main/resources/data/botania/advancements/main/terrasteel_weapon_craft.json b/src/main/resources/data/botania/advancements/main/terrasteel_weapon_craft.json index 19ad2e4bb..7a6433dab 100644 --- a/src/main/resources/data/botania/advancements/main/terrasteel_weapon_craft.json +++ b/src/main/resources/data/botania/advancements/main/terrasteel_weapon_craft.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:terrasword" + "item": "botania:terra_sword" }, "title": { "translate": "advancement.botania:terrasteelWeaponCraft" @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "botania:terrasword" + "item": "botania:terra_sword" } ] } diff --git a/src/main/resources/data/botania/advancements/main/tiara_wings.json b/src/main/resources/data/botania/advancements/main/tiara_wings.json index 3671d7be8..801b41095 100644 --- a/src/main/resources/data/botania/advancements/main/tiara_wings.json +++ b/src/main/resources/data/botania/advancements/main/tiara_wings.json @@ -1,8 +1,8 @@ { "display": { "icon": { - "item": "botania:flighttiara", - "data": 1 + "item": "botania:flight_tiara", + "nbt": "{\"variant\": 1}" }, "title": { "translate": "advancement.botania:tiaraWings" @@ -13,96 +13,15 @@ }, "parent": "botania:main/gaia_guardian_kill", "criteria": { - "meta1": { + "tiara": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "item": "botania:flighttiara", - "data": 1 - } - ] - } - }, - "meta2": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flighttiara", - "data": 2 - } - ] - } - }, - "meta3": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flighttiara", - "data": 3 - } - ] - } - }, - "meta4": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flighttiara", - "data": 4 - } - ] - } - }, - "meta5": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flighttiara", - "data": 5 - } - ] - } - }, - "meta6": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flighttiara", - "data": 6 - } - ] - } - }, - "meta7": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flighttiara", - "data": 7 - } - ] - } - }, - "meta8": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flighttiara", - "data": 8 + "item": "botania:flight_tiara" } ] } } - }, - "requirements": [ - [ "meta1", "meta2", "meta3", "meta4", "meta5", "meta6", "meta7", "meta8" ] - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/botania/advancements/main/tiny_potato_pet.json b/src/main/resources/data/botania/advancements/main/tiny_potato_pet.json index b3ffb9504..b1d08c012 100644 --- a/src/main/resources/data/botania/advancements/main/tiny_potato_pet.json +++ b/src/main/resources/data/botania/advancements/main/tiny_potato_pet.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "botania:tinypotato" + "item": "botania:tiny_potato" }, "title": { "translate": "advancement.botania:tinyPotatoPet" diff --git a/src/main/resources/data/botania/tags/flowers.json b/src/main/resources/data/botania/tags/items/flowers.json similarity index 100% rename from src/main/resources/data/botania/tags/flowers.json rename to src/main/resources/data/botania/tags/items/flowers.json diff --git a/src/main/resources/data/botania/tags/items/runes.json b/src/main/resources/data/botania/tags/items/runes.json new file mode 100644 index 000000000..22fa6ca00 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/runes.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "values": [ + "#botania:runes/water", + "#botania:runes/fire", + "#botania:runes/earth", + "#botania:runes/air", + "#botania:runes/spring", + "#botania:runes/summer", + "#botania:runes/autumn", + "#botania:runes/winter", + "#botania:runes/mana", + "#botania:runes/lust", + "#botania:runes/gluttony", + "#botania:runes/greed", + "#botania:runes/sloth", + "#botania:runes/wrath", + "#botania:runes/envy", + "#botania:runes/pride" + ] +} \ No newline at end of file