fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace Achievements with Advancements

Browse Source 
- Advancements are now in JSON files, converted by the included migration script.
- WizardryAdvancementTrigger is a generic achievement trigger that can be reused throughout the code to trigger custom advancements not covered by the JSON conditions.
- Plus some other small and obvious fixes.
This commit is contained in:
Philipp Rustemeier
2018-03-14 19:12:13 +01:00
parent 62c2a9e9b8
commit 612bbdb64d
48 changed files with 706 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/assets/ebwizardry/advancements/all_spells.json
+18 -20
View File
@@ -1,21 +1,19 @@
{
"display": {
"icon": {
"item": "wizardry:wizard_handbook"
},
"title": {
"translate": "achievement.all_spells"
},
"description": {
"translate": "achievement.all_spells.desc"
},
"frame": "goal",
"announce_to_chat": false
},
"parent": "wizardry:master",
"criteria": {
"coded_trigger": {
"trigger": "minecraft:impossible"
}
}
}
"display": {
"icon": {
"item": "ebwizardry:wizard_handbook"
},
"title": {
"translate": "achievement.all_spells"
},
"description": {
"translate": "achievement.all_spells.desc"
}
},
"parent": "ebwizardry:master",
"criteria": {
"criteria_0": {
"trigger": "ebwizardry:trigger_all_spells"
}
}
}
src/main/resources/assets/ebwizardry/advancements/anger_wizard.json
+18 -20
View File
@@ -1,21 +1,19 @@
{
"display": {
"icon": {
"item": "minecraft:iron_sword"
},
"title": {
"translate": "achievement.anger_wizard"
},
"description": {
"translate": "achievement.anger_wizard.desc"
},
"frame": "task",
"announce_to_chat": false
},
"parent": "wizardry:wizard_trade",
"criteria": {
"coded_trigger": {
"trigger": "minecraft:impossible"
}
}
}
"display": {
"icon": {
"item": "minecraft:iron_sword"
},
"title": {
"translate": "achievement.anger_wizard"
},
"description": {
"translate": "achievement.anger_wizard.desc"
}
},
"parent": "ebwizardry:wizard_trade",
"criteria": {
"criteria_0": {
"trigger": "ebwizardry:trigger_anger_wizard"
}
}
}
src/main/resources/assets/ebwizardry/advancements/apprentice.json
+18 -20
View File
@@ -1,21 +1,19 @@
{
"display": {
"icon": {
"item": "wizardry:apprentice_wand"
},
"title": {
"translate": "achievement.apprentice"
},
"description": {
"translate": "achievement.apprentice.desc"
},
"frame": "task",
"announce_to_chat": false
},
"parent": "wizardry:arcane_initiate",
"criteria": {
"coded_trigger": {
"trigger": "minecraft:impossible"
}
}
}
"display": {
"icon": {
"item": "ebwizardry:apprentice_wand"
},
"title": {
"translate": "achievement.apprentice"
},
"description": {
"translate": "achievement.apprentice.desc"
}
},
"parent": "ebwizardry:arcane_initiate",
"criteria": {
"criteria_0": {
"trigger": "ebwizardry:trigger_apprentice"
}
}
}
src/main/resources/assets/ebwizardry/advancements/arcane_initiate.json
+25 -20
View File
@@ -1,21 +1,26 @@
{
"display": {
"icon": {
"item": "wizardry:magic_wand"
},
"title": {
"translate": "achievement.arcane_initiate"
},
"description": {
"translate": "achievement.arcane_initiate.desc"
},
"frame": "task",
"announce_to_chat": false
},
"parent": "wizardry:crystal",
"criteria": {
"coded_trigger": {
"trigger": "minecraft:impossible"
}
}
}
"display": {
"title": {
"translate": "achievement.arcane_initiate"
},
"description": {
"translate": "achievement.arcane_initiate.desc"
},
"icon": {
"item": "ebwizardry:magic_wand"
}
},
"parent": "ebwizardry:crystal",
"criteria": {
"criteria_0": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "ebwizardry:magic_wand"
}
]
}
}
}
}
src/main/resources/assets/ebwizardry/advancements/armour_set.json
+18 -20
View File
@@ -1,21 +1,19 @@
{
"display": {
"icon": {
"item": "wizardry:wizard_hat"
},
"title": {
"translate": "achievement.armour_set"
},
"description": {
"translate": "achievement.armour_set.desc"
},
"frame": "task",
"announce_to_chat": false
},
"parent": "wizardry:arcane_initiate",
"criteria": {
"coded_trigger": {
"trigger": "minecraft:impossible"
}
}
}
"display": {
"title": {
"translate": "achievement.armour_set"
},
"description": {
"translate": "achievement.armour_set.desc"
},
"icon": {
"item": "ebwizardry:wizard_hat"
}
},
"parent": "ebwizardry:arcane_initiate",
"criteria": {
"criteria_0": {
"trigger": "ebwizardry:trigger_armour_set"
}
}
}
src/main/resources/assets/ebwizardry/advancements/buy_master_spell.json
+18 -20
View File
@@ -1,21 +1,19 @@
{
"display": {
"icon": {
"item": "wizardry:spell_book"
},
"title": {
"translate": "achievement.buy_master_spell"
},
"description": {
"translate": "achievement.buy_master_spell.desc"
},
"frame": "goal",
"announce_to_chat": false
},
"parent": "wizardry:wizard_trade",
"criteria": {
"coded_trigger": {
"trigger": "minecraft:impossible"
}
}
}
"display": {
"title": {
"translate": "achievement.buy_master_spell"
},
"description": {
"translate": "achievement.buy_master_spell.desc"
},
"icon": {
"item": "ebwizardry:spell_book"
}
},
"parent": "ebwizardry:wizard_trade",
"criteria": {
"criteria_0": {
"trigger": "ebwizardry:trigger_buy_master_spell"
}
}
}
src/main/resources/assets/ebwizardry/advancements/charge_creeper.json
+18 -20
View File
@@ -1,21 +1,19 @@
{
"display": {
"icon": {
"item": "minecraft:gunpowder"
},
"title": {
"translate": "achievement.charge_creeper"
},
"description": {
"translate": "achievement.charge_creeper.desc"
},
"frame": "task",
"announce_to_chat": false
},
"parent": "wizardry:arcane_initiate",
"criteria": {
"coded_trigger": {
"trigger": "minecraft:impossible"
}
}
}
"display": {
"title": {
"translate": "achievement.charge_creeper"
},
"description": {
"translate": "achievement.charge_creeper.desc"
},
"icon": {
"item": "minecraft:gunpowder"
}
},
"parent": "ebwizardry:arcane_initiate",
"criteria": {
"criteria_0": {
"trigger": "ebwizardry:trigger_charge_creeper"
}
}
}
src/main/resources/assets/ebwizardry/advancements/craft_flask.json
+25 -20
View File
@@ -1,21 +1,26 @@
{
"display": {
"icon": {
"item": "wizardry:mana_flask"
},
"title": {
"translate": "achievement.craft_flask"
},
"description": {
"translate": "achievement.craft_flask.desc"
},
"frame": "task",
"announce_to_chat": false
},
"parent": "wizardry:arcane_initiate",
"criteria": {
"coded_trigger": {
"trigger": "minecraft:impossible"
}
}
}
"display": {
"title": {
"translate": "achievement.craft_flask"
},
"description": {
"translate": "achievement.craft_flask.desc"
},
"icon": {
"item": "ebwizardry:mana_flask"
}
},
"parent": "ebwizardry:arcane_initiate",
"criteria": {
"criteria_0": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "ebwizardry:mana_flask"
}
]
}
}
}
}
src/main/resources/assets/ebwizardry/advancements/crystal.json
+25 -20
View File
@@ -1,21 +1,26 @@
{
"display": {
"icon": {
"item": "wizardry:magic_crystal"
},
"title": {
"translate": "achievement.crystal"
},
"description": {
"translate": "achievement.crystal.desc"
},
"frame": "task",
"announce_to_chat": false
},
"parent": "wizardry:root",
"criteria": {
"coded_trigger": {
"trigger": "minecraft:impossible"
}
}
}
"display": {
"title": {
"translate": "achievement.crystal"
},
"description": {
"translate": "achievement.crystal.desc"
},
"icon": {
"item": "ebwizardry:magic_crystal"
}
},
"parent": "ebwizardry:root",
"criteria": {
"criteria_0": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "ebwizardry:magic_crystal"
}
]
}
}
}
}
src/main/resources/assets/ebwizardry/advancements/defeat_evil_wizard.json
+21 -20
View File
@@ -1,21 +1,22 @@
{
"display": {
"icon": {
"item": "wizardry:wizard_boots_necromancy"
},
"title": {
"translate": "achievement.defeat_evil_wizard"
},
"description": {
"translate": "achievement.defeat_evil_wizard.desc"
},
"frame": "task",
"announce_to_chat": false
},
"parent": "wizardry:wizard_trade",
"criteria": {
"coded_trigger": {
"trigger": "minecraft:impossible"
}
}
}
"display": {
"title": {
"translate": "achievement.defeat_evil_wizard"
},
"description": {
"translate": "achievement.defeat_evil_wizard.desc"
},
"icon": {
"item": "ebwizardry:wizard_boots_necromancy"
}
},
"parent": "ebwizardry:wizard_trade",
"criteria": {
"criteria_0": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": { "type": "ebwizardry:evil_wizard" }
}
}
}
}
src/main/resources/assets/ebwizardry/advancements/element_master.json
+18 -20
View File
@@ -1,21 +1,19 @@
{
"display": {
"icon": {
"item": "wizardry:master_ice_wand"
},
"title": {
"translate": "achievement.element_master"
},
"description": {
"translate": "achievement.element_master.desc"
},
"frame": "goal",
"announce_to_chat": false
},
"parent": "wizardry:elemental",
"criteria": {
"coded_trigger": {
"trigger": "minecraft:impossible"
}
}
}
"display": {
"title": {
"translate": "achievement.element_master"
},
"description": {
"translate": "achievement.element_master.desc"
},
"icon": {
"item": "ebwizardry:master_ice_wand"
}
},
"parent": "ebwizardry:elemental",
"criteria": {
"criteria_0": {
"trigger": "ebwizardry:trigger_element_master"
}
}
}
src/main/resources/assets/ebwizardry/advancements/elemental.json
+18 -20
View File
@@ -1,21 +1,19 @@
{
"display": {
"icon": {
"item": "wizardry:basic_fire_wand"
},
"title": {
"translate": "achievement.elemental"
},
"description": {
"translate": "achievement.elemental.desc"
},
"frame": "task",
"announce_to_chat": false
},
"parent": "wizardry:arcane_initiate",
"criteria": {
"coded_trigger": {
"trigger": "minecraft:impossible"
}
}
}
"display": {
"title": {
"translate": "achievement.elemental"
},
"description": {
"translate": "achievement.elemental.desc"
},
"icon": {
"item": "ebwizardry:basic_fire_wand"
}
},
"parent": "ebwizardry:arcane_initiate",
"criteria": {
"criteria_0": {
"trigger": "ebwizardry:trigger_elemental"
}
}
}
src/main/resources/assets/ebwizardry/advancements/frankenstein.json
+18 -20
View File
@@ -1,21 +1,19 @@
{
"display": {
"icon": {
"item": "wizardry:advanced_lightning_wand"
},
"title": {
"translate": "achievement.frankenstein"
},
"description": {
"translate": "achievement.frankenstein.desc"
},
"frame": "goal",
"announce_to_chat": false
},
"parent": "wizardry:charge_creeper",
"criteria": {
"coded_trigger": {
"trigger": "minecraft:impossible"
}
}
}
"display": {
"title": {
"translate": "achievement.frankenstein"
},
"description": {
"translate": "achievement.frankenstein.desc"
},
"icon": {
"item": "ebwizardry:advanced_lightning_wand"
}
},
"parent": "ebwizardry:charge_creeper",
"criteria": {
"criteria_0": {
"trigger": "ebwizardry:trigger_frankenstein"
}
}
}
src/main/resources/assets/ebwizardry/advancements/freeze_blaze.json
+18 -20
View File
@@ -1,21 +1,19 @@
{
"display": {
"icon": {
"item": "minecraft:ice"
},
"title": {
"translate": "achievement.freeze_blaze"
},
"description": {
"translate": "achievement.freeze_blaze.desc"
},
"frame": "task",
"announce_to_chat": false
},
"parent": "wizardry:apprentice",
"criteria": {
"coded_trigger": {
"trigger": "minecraft:impossible"
}
}
}
"display": {
"title": {
"translate": "achievement.freeze_blaze"
},
"description": {
"translate": "achievement.freeze_blaze.desc"
},
"icon": {
"item": "minecraft:ice"
}
},
"parent": "ebwizardry:apprentice",
"criteria": {
"criteria_0": {
"trigger": "ebwizardry:trigger_freeze_blaze"
}
}
}
src/main/resources/assets/ebwizardry/advancements/identify_spell.json
+18 -20
View File
@@ -1,21 +1,19 @@
{
"display": {
"icon": {
"item": "wizardry:identification_scroll"
},
"title": {
"translate": "achievement.identify_spell"
},
"description": {
"translate": "achievement.identify_spell.desc"
},
"frame": "task",
"announce_to_chat": false
},
"parent": "wizardry:arcane_initiate",
"criteria": {
"coded_trigger": {
"trigger": "minecraft:impossible"
}
}
}
"display": {
"title": {
"translate": "achievement.identify_spell"
},
"description": {
"translate": "achievement.identify_spell.desc"
},
"icon": {
"item": "ebwizardry:identification_scroll"
}
},
"parent": "ebwizardry:arcane_initiate",
"criteria": {
"criteria_0": {
"trigger": "ebwizardry:trigger_identify_spell"
}
}
}
src/main/resources/assets/ebwizardry/advancements/jam_wizard.json
+18 -20
View File
@@ -1,21 +1,19 @@
{
"display": {
"icon": {
"item": "minecraft:web"
},
"title": {
"translate": "achievement.jam_wizard"
},
"description": {
"translate": "achievement.jam_wizard.desc"
},
"frame": "task",
"announce_to_chat": false
},
"parent": "wizardry:apprentice",
"criteria": {
"coded_trigger": {
"trigger": "minecraft:impossible"
}
}
}
"display": {
"title": {
"translate": "achievement.jam_wizard"
},
"description": {
"translate": "achievement.jam_wizard.desc"
},
"icon": {
"item": "minecraft:web"
}
},
"parent": "ebwizardry:apprentice",
"criteria": {
"criteria_0": {
"trigger": "ebwizardry:trigger_jam_wizard"
}
}
}
src/main/resources/assets/ebwizardry/advancements/legendary.json
+18 -20
View File
@@ -1,21 +1,19 @@
{
"display": {
"icon": {
"item": "wizardry:armour_upgrade"
},
"title": {
"translate": "achievement.legendary"
},
"description": {
"translate": "achievement.legendary.desc"
},
"frame": "goal",
"announce_to_chat": false
},
"parent": "wizardry:armour_set",
"criteria": {
"coded_trigger": {
"trigger": "minecraft:impossible"
}
}
}
"display": {
"title": {
"translate": "achievement.legendary"
},
"description": {
"translate": "achievement.legendary.desc"
},
"icon": {
"item": "ebwizardry:armour_upgrade"
}
},
"parent": "ebwizardry:armour_set",
"criteria": {
"criteria_0": {
"trigger": "ebwizardry:trigger_legendary"
}
}
}
src/main/resources/assets/ebwizardry/advancements/master.json
+18 -20
View File
@@ -1,21 +1,19 @@
{
"display": {
"icon": {
"item": "wizardry:master_wand"
},
"title": {
"translate": "achievement.master"
},
"description": {
"translate": "achievement.master.desc"
},
"frame": "task",
"announce_to_chat": false
},
"parent": "wizardry:apprentice",
"criteria": {
"coded_trigger": {
"trigger": "minecraft:impossible"
}
}
}
"display": {
"title": {
"translate": "achievement.master"
},
"description": {
"translate": "achievement.master.desc"
},
"icon": {
"item": "ebwizardry:master_wand"
}
},
"parent": "ebwizardry:apprentice",
"criteria": {
"criteria_0": {
"trigger": "ebwizardry:trigger_master"
}
}
}
src/main/resources/assets/ebwizardry/advancements/max_out_wand.json
+18 -20
View File
@@ -1,21 +1,19 @@
{
"display": {
"icon": {
"item": "wizardry:arcane_tome"
},
"title": {
"translate": "achievement.max_out_wand"
},
"description": {
"translate": "achievement.max_out_wand.desc"
},
"frame": "goal",
"announce_to_chat": false
},
"parent": "wizardry:special_upgrade",
"criteria": {
"coded_trigger": {
"trigger": "minecraft:impossible"
}
}
}
"display": {
"title": {
"translate": "achievement.max_out_wand"
},
"description": {
"translate": "achievement.max_out_wand.desc"
},
"icon": {
"item": "ebwizardry:arcane_tome"
}
},
"parent": "ebwizardry:special_upgrade",
"criteria": {
"criteria_0": {
"trigger": "ebwizardry:trigger_max_out_wand"
}
}
}
src/main/resources/assets/ebwizardry/advancements/pig_tornado.json
+18 -20
View File
@@ -1,21 +1,19 @@
{
"display": {
"icon": {
"item": "minecraft:saddle"
},
"title": {
"translate": "achievement.pig_tornado"
},
"description": {
"translate": "achievement.pig_tornado.desc"
},
"frame": "goal",
"announce_to_chat": false
},
"parent": "wizardry:apprentice",
"criteria": {
"coded_trigger": {
"trigger": "minecraft:impossible"
}
}
}
"display": {
"title": {
"translate": "achievement.pig_tornado"
},
"description": {
"translate": "achievement.pig_tornado.desc"
},
"icon": {
"item": "minecraft:saddle"
}
},
"parent": "ebwizardry:apprentice",
"criteria": {
"criteria_0": {
"trigger": "ebwizardry:trigger_pig_tornado"
}
}
}
src/main/resources/assets/ebwizardry/advancements/root.json
+26 -21
View File
@@ -1,22 +1,27 @@
{
"display": {
"icon": {
"item": "wizardry:wizard_handbook"
},
"title": {
"translate": "achievement.root"
},
"description": {
"translate": "achievement.root.desc"
},
"background": "minecraft:textures/blocks/stone.png",
"show_toast": false,
"announce_to_chat": false,
"frame": "challenge"
},
"criteria": {
"auto": {
"trigger": "location"
}
}
}
"display": {
"title": {
"translate": "itemGroup.wizardry"
},
"description": {
"translate": "itemGroup.wizardry"
},
"show_toast": false,
"announce_to_chat": false,
"icon": {
"item": "ebwizardry:wizard_handbook"
}
},
"criteria": {
"criteria_0": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "ebwizardry:magic_crystal"
}
]
}
}
}
}
src/main/resources/assets/ebwizardry/advancements/self_destruct.json
+18 -20
View File
@@ -1,21 +1,19 @@
{
"display": {
"icon": {
"item": "minecraft:pumpkin"
},
"title": {
"translate": "achievement.self_destruct"
},
"description": {
"translate": "achievement.self_destruct.desc"
},
"frame": "task",
"announce_to_chat": false
},
"parent": "wizardry:arcane_initiate",
"criteria": {
"coded_trigger": {
"trigger": "minecraft:impossible"
}
}
}
"display": {
"title": {
"translate": "achievement.self_destruct"
},
"description": {
"translate": "achievement.self_destruct.desc"
},
"icon": {
"item": "minecraft:pumpkin"
}
},
"parent": "ebwizardry:arcane_initiate",
"criteria": {
"criteria_0": {
"trigger": "ebwizardry:trigger_self_destruct"
}
}
}
src/main/resources/assets/ebwizardry/advancements/slime_skeleton.json
+18 -20
View File
@@ -1,21 +1,19 @@
{
"display": {
"icon": {
"item": "minecraft:slime_ball"
},
"title": {
"translate": "achievement.slime_skeleton"
},
"description": {
"translate": "achievement.slime_skeleton.desc"
},
"frame": "task",
"announce_to_chat": false
},
"parent": "wizardry:apprentice",
"criteria": {
"coded_trigger": {
"trigger": "minecraft:impossible"
}
}
}
"display": {
"title": {
"translate": "achievement.slime_skeleton"
},
"description": {
"translate": "achievement.slime_skeleton.desc"
},
"icon": {
"item": "minecraft:slime_ball"
}
},
"parent": "ebwizardry:apprentice",
"criteria": {
"criteria_0": {
"trigger": "ebwizardry:trigger_slime_skeleton"
}
}
}
src/main/resources/assets/ebwizardry/advancements/special_upgrade.json
+18 -20
View File
@@ -1,21 +1,19 @@
{
"display": {
"icon": {
"item": "wizardry:condenser_upgrade"
},
"title": {
"translate": "achievement.special_upgrade"
},
"description": {
"translate": "achievement.special_upgrade.desc"
},
"frame": "task",
"announce_to_chat": false
},
"parent": "wizardry:arcane_initiate",
"criteria": {
"coded_trigger": {
"trigger": "minecraft:impossible"
}
}
}
"display": {
"title": {
"translate": "achievement.special_upgrade"
},
"description": {
"translate": "achievement.special_upgrade.desc"
},
"icon": {
"item": "ebwizardry:condenser_upgrade"
}
},
"parent": "ebwizardry:arcane_initiate",
"criteria": {
"criteria_0": {
"trigger": "ebwizardry:trigger_special_upgrade"
}
}
}
src/main/resources/assets/ebwizardry/advancements/wizard_trade.json
+18 -20
View File
@@ -1,21 +1,19 @@
{
"display": {
"icon": {
"item": "minecraft:emerald"
},
"title": {
"translate": "achievement.wizard_trade"
},
"description": {
"translate": "achievement.wizard_trade.desc"
},
"frame": "task",
"announce_to_chat": false
},
"parent": "wizardry:arcane_initiate",
"criteria": {
"coded_trigger": {
"trigger": "minecraft:impossible"
}
}
}
"display": {
"title": {
"translate": "achievement.wizard_trade"
},
"description": {
"translate": "achievement.wizard_trade.desc"
},
"icon": {
"item": "minecraft:emerald"
}
},
"parent": "ebwizardry:arcane_initiate",
"criteria": {
"criteria_0": {
"trigger": "ebwizardry:trigger_wizard_trade"
}
}
}