From 8f77874277d3729319884246e647c34794f81997 Mon Sep 17 00:00:00 2001 From: VT-14 Date: Sat, 7 Oct 2023 10:19:23 -0400 Subject: [PATCH 1/2] Create Blood Magic's Root Advancement This creates the Advancement Tab, and the first advancement on it which is for holding a Blood Altar. --- .../assets/bloodmagic/lang/en_us.json | 2 + .../common/data/GeneratorLanguage.java | 4 ++ .../textures/gui/advancements_background.png | Bin 0 -> 540 bytes .../advancements/bloodmagic/root.json | 36 ++++++++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 src/main/resources/assets/bloodmagic/textures/gui/advancements_background.png create mode 100644 src/main/resources/data/bloodmagic/advancements/bloodmagic/root.json diff --git a/src/generated/resources/assets/bloodmagic/lang/en_us.json b/src/generated/resources/assets/bloodmagic/lang/en_us.json index f8d39db294..5cc7a1ed37 100644 --- a/src/generated/resources/assets/bloodmagic/lang/en_us.json +++ b/src/generated/resources/assets/bloodmagic/lang/en_us.json @@ -1,4 +1,6 @@ { + "advancements.bloodmagic.root.description": "Hold a Blood Altar", + "advancements.bloodmagic.root.title": "Blood Magic", "anointment.bloodmagic.bow_power": "Heavy Shot", "anointment.bloodmagic.bow_velocity": "Sniping", "anointment.bloodmagic.fortune": "Fortunate", diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java index bd37526a2c..c21d4182db 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java @@ -524,6 +524,10 @@ protected void addTranslations() add("bloodmagic.keybind.cycle_holding_pos", "Cycle Sigil (+)"); add("bloodmagic.keybind.cycle_holding_neg", "Cycle Sigil (-)"); + // Advancements + add("advancements.bloodmagic.root.title", "Blood Magic"); + add("advancements.bloodmagic.root.description", "Hold a Blood Altar"); + // Block names addBlock(BloodMagicBlocks.BLANK_RUNE, "Blank Rune"); addBlock(BloodMagicBlocks.SPEED_RUNE, "Speed Rune"); diff --git a/src/main/resources/assets/bloodmagic/textures/gui/advancements_background.png b/src/main/resources/assets/bloodmagic/textures/gui/advancements_background.png new file mode 100644 index 0000000000000000000000000000000000000000..09d1799553f8cfa34037ec27dc6c63e32c4c49d7 GIT binary patch literal 540 zcmV+%0^|LOP)z#AfdzK<;M9G}e4IJiz8BFP(Z1BFZ?X&{0;E&?Xc-zh4(3p*VpbASvVTiqq z`j52NtS$Pk;^58@8Db{<@`pV?V!$@ov<@K?5tisnVIKXgHIO1Xho2sK{oBK_9WGf* z<`5B~Wj-~Uu)%TkfNQA=+s6Aw6U+xFCB0+?j?$apu#N)bG_iO;YyG-*APO2#(hcV5 z2kEDY!w+oEMN5O@gcTeV=E4pZ0Nh1}*k}6F6XCQ1&Z?EQU$l-a7lj0{xp1&tolEjU z)oVTI3yxb;=1SFbJlP3uSrr0MwW$L`Kw9~C$hRKW+! zj1`n{_*dqh1)@kijJ|y0f0+c7U$fpl&foFmxy6?jA43Lef=YI&>&JMzv0*A~6l>9k z*sjvT4^u8P^?SO6NIr~yD4et2r2xiQqTA0W&R2iiWy<`z5-T^+f;@~}!3sF0BU4-S zpH5ht`7*P==? eMTKqT?)(Q!v={Q{3yci_0000 Date: Fri, 13 Oct 2023 15:38:41 -0400 Subject: [PATCH 2/2] Initial batch of Advancements Changed the root "Blood Magic" advancement to work on right clicking any tier of Blood Altar. Added Advancements for each tier of Altar. Will trigger when activating any Blood Altar of the same or higher tier. Added some of the basic Demon Will progress chain. --- .../assets/bloodmagic/lang/en_us.json | 10 +- .../common/data/GeneratorLanguage.java | 10 +- .../advancements/bloodmagic/altar_five.json | 40 ++++++++ .../advancements/bloodmagic/altar_four.json | 57 ++++++++++++ .../advancements/bloodmagic/altar_three.json | 74 +++++++++++++++ .../advancements/bloodmagic/altar_two.json | 91 +++++++++++++++++++ .../advancements/bloodmagic/demonwill.json | 34 +++++++ .../advancements/bloodmagic/root.json | 17 ++-- .../advancements/bloodmagic/soulgem1.json | 34 +++++++ .../advancements/bloodmagic/soulgem2.json | 34 +++++++ .../advancements/bloodmagic/soulgem3.json | 34 +++++++ .../advancements/bloodmagic/soulgem4.json | 34 +++++++ .../advancements/bloodmagic/soulsnare.json | 34 +++++++ .../advancements/bloodmagic/soulsword.json | 34 +++++++ 14 files changed, 528 insertions(+), 9 deletions(-) create mode 100644 src/main/resources/data/bloodmagic/advancements/bloodmagic/altar_five.json create mode 100644 src/main/resources/data/bloodmagic/advancements/bloodmagic/altar_four.json create mode 100644 src/main/resources/data/bloodmagic/advancements/bloodmagic/altar_three.json create mode 100644 src/main/resources/data/bloodmagic/advancements/bloodmagic/altar_two.json create mode 100644 src/main/resources/data/bloodmagic/advancements/bloodmagic/demonwill.json create mode 100644 src/main/resources/data/bloodmagic/advancements/bloodmagic/soulgem1.json create mode 100644 src/main/resources/data/bloodmagic/advancements/bloodmagic/soulgem2.json create mode 100644 src/main/resources/data/bloodmagic/advancements/bloodmagic/soulgem3.json create mode 100644 src/main/resources/data/bloodmagic/advancements/bloodmagic/soulgem4.json create mode 100644 src/main/resources/data/bloodmagic/advancements/bloodmagic/soulsnare.json create mode 100644 src/main/resources/data/bloodmagic/advancements/bloodmagic/soulsword.json diff --git a/src/generated/resources/assets/bloodmagic/lang/en_us.json b/src/generated/resources/assets/bloodmagic/lang/en_us.json index 5cc7a1ed37..86d580a77c 100644 --- a/src/generated/resources/assets/bloodmagic/lang/en_us.json +++ b/src/generated/resources/assets/bloodmagic/lang/en_us.json @@ -1,5 +1,13 @@ { - "advancements.bloodmagic.root.description": "Hold a Blood Altar", + "advancements.bloodmagic.altar_five.description": "Use a Tier-5 Blood Altar", + "advancements.bloodmagic.altar_five.title": "Tier-5 Blood Altar", + "advancements.bloodmagic.altar_four.description": "Use a Tier-4+ Blood Altar", + "advancements.bloodmagic.altar_four.title": "Tier-4 Blood Altar", + "advancements.bloodmagic.altar_three.description": "Use a Tier-3+ Blood Altar", + "advancements.bloodmagic.altar_three.title": "Tier-3 Blood Altar", + "advancements.bloodmagic.altar_two.description": "Use a Tier-2+ Blood Altar", + "advancements.bloodmagic.altar_two.title": "Tier-2 Blood Altar", + "advancements.bloodmagic.root.description": "Use a Blood Altar", "advancements.bloodmagic.root.title": "Blood Magic", "anointment.bloodmagic.bow_power": "Heavy Shot", "anointment.bloodmagic.bow_velocity": "Sniping", diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java index c21d4182db..1d36b2f033 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java @@ -526,7 +526,15 @@ protected void addTranslations() // Advancements add("advancements.bloodmagic.root.title", "Blood Magic"); - add("advancements.bloodmagic.root.description", "Hold a Blood Altar"); + add("advancements.bloodmagic.root.description", "Use a Blood Altar"); + add("advancements.bloodmagic.altar_two.title", "Tier-2 Blood Altar"); + add("advancements.bloodmagic.altar_two.description", "Use a Tier-2+ Blood Altar"); + add("advancements.bloodmagic.altar_three.title", "Tier-3 Blood Altar"); + add("advancements.bloodmagic.altar_three.description", "Use a Tier-3+ Blood Altar"); + add("advancements.bloodmagic.altar_four.title", "Tier-4 Blood Altar"); + add("advancements.bloodmagic.altar_four.description", "Use a Tier-4+ Blood Altar"); + add("advancements.bloodmagic.altar_five.title", "Tier-5 Blood Altar"); + add("advancements.bloodmagic.altar_five.description", "Use a Tier-5 Blood Altar"); // Block names addBlock(BloodMagicBlocks.BLANK_RUNE, "Blank Rune"); diff --git a/src/main/resources/data/bloodmagic/advancements/bloodmagic/altar_five.json b/src/main/resources/data/bloodmagic/advancements/bloodmagic/altar_five.json new file mode 100644 index 0000000000..f549604a96 --- /dev/null +++ b/src/main/resources/data/bloodmagic/advancements/bloodmagic/altar_five.json @@ -0,0 +1,40 @@ +{ + "parent": "bloodmagic:bloodmagic/altar_four", + "criteria": { + "altar5": { + "trigger": "minecraft:item_used_on_block", + "conditions": { + "location": [ + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "blocks": ["bloodmagic:altar"], + "nbt": "{bloodAltar:{upgradeLevel:\"FIVE\"}}" + } + } + } + ] + } + } + }, + "display": { + "icon": { + "item": "bloodmagic:altar" + }, + "title": { + "translate": "advancements.bloodmagic.altar_five.title" + }, + "frame": "task", + "description": { + "translate": "advancements.bloodmagic.altar_five.description" + }, + "show_toast": false, + "announce_to_chat": true + }, + "requirements": [ + [ + "altar5" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/advancements/bloodmagic/altar_four.json b/src/main/resources/data/bloodmagic/advancements/bloodmagic/altar_four.json new file mode 100644 index 0000000000..c520229187 --- /dev/null +++ b/src/main/resources/data/bloodmagic/advancements/bloodmagic/altar_four.json @@ -0,0 +1,57 @@ +{ + "parent": "bloodmagic:bloodmagic/altar_three", + "criteria": { + "altar4": { + "trigger": "minecraft:item_used_on_block", + "conditions": { + "location": [ + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "blocks": ["bloodmagic:altar"], + "nbt": "{bloodAltar:{upgradeLevel:\"FOUR\"}}" + } + } + } + ] + } + }, + "altar5": { + "trigger": "minecraft:item_used_on_block", + "conditions": { + "location": [ + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "blocks": ["bloodmagic:altar"], + "nbt": "{bloodAltar:{upgradeLevel:\"FIVE\"}}" + } + } + } + ] + } + } + }, + "display": { + "icon": { + "item": "bloodmagic:altar" + }, + "title": { + "translate": "advancements.bloodmagic.altar_four.title" + }, + "frame": "task", + "description": { + "translate": "advancements.bloodmagic.altar_four.description" + }, + "show_toast": false, + "announce_to_chat": true + }, + "requirements": [ + [ + "altar4", + "altar5" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/advancements/bloodmagic/altar_three.json b/src/main/resources/data/bloodmagic/advancements/bloodmagic/altar_three.json new file mode 100644 index 0000000000..c1272b1d05 --- /dev/null +++ b/src/main/resources/data/bloodmagic/advancements/bloodmagic/altar_three.json @@ -0,0 +1,74 @@ +{ + "parent": "bloodmagic:bloodmagic/altar_two", + "criteria": { + "altar3": { + "trigger": "minecraft:item_used_on_block", + "conditions": { + "location": [ + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "blocks": ["bloodmagic:altar"], + "nbt": "{bloodAltar:{upgradeLevel:\"THREE\"}}" + } + } + } + ] + } + }, + "altar4": { + "trigger": "minecraft:item_used_on_block", + "conditions": { + "location": [ + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "blocks": ["bloodmagic:altar"], + "nbt": "{bloodAltar:{upgradeLevel:\"FOUR\"}}" + } + } + } + ] + } + }, + "altar5": { + "trigger": "minecraft:item_used_on_block", + "conditions": { + "location": [ + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "blocks": ["bloodmagic:altar"], + "nbt": "{bloodAltar:{upgradeLevel:\"FIVE\"}}" + } + } + } + ] + } + } + }, + "display": { + "icon": { + "item": "bloodmagic:altar" + }, + "title": { + "translate": "advancements.bloodmagic.altar_three.title" + }, + "frame": "task", + "description": { + "translate": "advancements.bloodmagic.altar_three.description" + }, + "show_toast": false, + "announce_to_chat": true + }, + "requirements": [ + [ + "altar3", + "altar4", + "altar5" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/advancements/bloodmagic/altar_two.json b/src/main/resources/data/bloodmagic/advancements/bloodmagic/altar_two.json new file mode 100644 index 0000000000..89fa340737 --- /dev/null +++ b/src/main/resources/data/bloodmagic/advancements/bloodmagic/altar_two.json @@ -0,0 +1,91 @@ +{ + "parent": "bloodmagic:bloodmagic/root", + "criteria": { + "altar2": { + "trigger": "minecraft:item_used_on_block", + "conditions": { + "location": [ + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "blocks": ["bloodmagic:altar"], + "nbt": "{bloodAltar:{upgradeLevel:\"TWO\"}}" + } + } + } + ] + } + }, + "altar3": { + "trigger": "minecraft:item_used_on_block", + "conditions": { + "location": [ + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "blocks": ["bloodmagic:altar"], + "nbt": "{bloodAltar:{upgradeLevel:\"THREE\"}}" + } + } + } + ] + } + }, + "altar4": { + "trigger": "minecraft:item_used_on_block", + "conditions": { + "location": [ + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "blocks": ["bloodmagic:altar"], + "nbt": "{bloodAltar:{upgradeLevel:\"FOUR\"}}" + } + } + } + ] + } + }, + "altar5": { + "trigger": "minecraft:item_used_on_block", + "conditions": { + "location": [ + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "blocks": ["bloodmagic:altar"], + "nbt": "{bloodAltar:{upgradeLevel:\"FIVE\"}}" + } + } + } + ] + } + } + }, + "display": { + "icon": { + "item": "bloodmagic:altar" + }, + "title": { + "translate": "advancements.bloodmagic.altar_two.title" + }, + "frame": "task", + "description": { + "translate": "advancements.bloodmagic.altar_two.description" + }, + "show_toast": false, + "announce_to_chat": true + }, + "requirements": [ + [ + "altar2", + "altar3", + "altar4", + "altar5" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/advancements/bloodmagic/demonwill.json b/src/main/resources/data/bloodmagic/advancements/bloodmagic/demonwill.json new file mode 100644 index 0000000000..1de911da48 --- /dev/null +++ b/src/main/resources/data/bloodmagic/advancements/bloodmagic/demonwill.json @@ -0,0 +1,34 @@ +{ + "parent": "bloodmagic:bloodmagic/soulsnare", + "criteria": { + "hold_item":{ + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": ["bloodmagic:basemonstersoul"] + } + ] + } + } + }, + "display": { + "icon": { + "item": "bloodmagic:basemonstersoul" + }, + "title": { + "translate": "advancements.bloodmagic.demonwill.title" + }, + "frame": "task", + "description": { + "translate": "advancements.bloodmagic.demonwill.description" + }, + "show_toast": false, + "announce_to_chat": false + }, + "requirements": [ + [ + "hold_item" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/advancements/bloodmagic/root.json b/src/main/resources/data/bloodmagic/advancements/bloodmagic/root.json index af92ca77ff..ffed35bc75 100644 --- a/src/main/resources/data/bloodmagic/advancements/bloodmagic/root.json +++ b/src/main/resources/data/bloodmagic/advancements/bloodmagic/root.json @@ -1,13 +1,16 @@ { "criteria": { - "get_blood_altar": { - "trigger": "minecraft:inventory_changed", + "use_altar": { + "trigger": "minecraft:item_used_on_block", "conditions": { - "items": [ + "location": [ { - "items": [ - "bloodmagic:altar" - ] + "condition": "minecraft:location_check", + "predicate": { + "block": { + "blocks": ["bloodmagic:altar"] + } + } } ] } @@ -30,7 +33,7 @@ }, "requirements": [ [ - "get_blood_altar" + "use_altar" ] ] } \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/advancements/bloodmagic/soulgem1.json b/src/main/resources/data/bloodmagic/advancements/bloodmagic/soulgem1.json new file mode 100644 index 0000000000..1335e05346 --- /dev/null +++ b/src/main/resources/data/bloodmagic/advancements/bloodmagic/soulgem1.json @@ -0,0 +1,34 @@ +{ + "parent": "bloodmagic:bloodmagic/demonwill", + "criteria": { + "hold_item":{ + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": ["bloodmagic:soulgempetty"] + } + ] + } + } + }, + "display": { + "icon": { + "item": "bloodmagic:soulgempetty" + }, + "title": { + "translate": "advancements.bloodmagic.soulgem1.title" + }, + "frame": "task", + "description": { + "translate": "advancements.bloodmagic.soulgem1.description" + }, + "show_toast": false, + "announce_to_chat": true + }, + "requirements": [ + [ + "hold_item" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/advancements/bloodmagic/soulgem2.json b/src/main/resources/data/bloodmagic/advancements/bloodmagic/soulgem2.json new file mode 100644 index 0000000000..b505dc7c1e --- /dev/null +++ b/src/main/resources/data/bloodmagic/advancements/bloodmagic/soulgem2.json @@ -0,0 +1,34 @@ +{ + "parent": "bloodmagic:bloodmagic/soulgem1", + "criteria": { + "hold_item":{ + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": ["bloodmagic:soulgemlesser"] + } + ] + } + } + }, + "display": { + "icon": { + "item": "bloodmagic:soulgemlesser" + }, + "title": { + "translate": "advancements.bloodmagic.soulgem2.title" + }, + "frame": "task", + "description": { + "translate": "advancements.bloodmagic.soulgem2.description" + }, + "show_toast": false, + "announce_to_chat": true + }, + "requirements": [ + [ + "hold_item" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/advancements/bloodmagic/soulgem3.json b/src/main/resources/data/bloodmagic/advancements/bloodmagic/soulgem3.json new file mode 100644 index 0000000000..9693a1e672 --- /dev/null +++ b/src/main/resources/data/bloodmagic/advancements/bloodmagic/soulgem3.json @@ -0,0 +1,34 @@ +{ + "parent": "bloodmagic:bloodmagic/soulgem2", + "criteria": { + "hold_item":{ + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": ["bloodmagic:soulgemcommon"] + } + ] + } + } + }, + "display": { + "icon": { + "item": "bloodmagic:soulgemcommon" + }, + "title": { + "translate": "advancements.bloodmagic.soulgem3.title" + }, + "frame": "task", + "description": { + "translate": "advancements.bloodmagic.soulgem3.description" + }, + "show_toast": false, + "announce_to_chat": true + }, + "requirements": [ + [ + "hold_item" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/advancements/bloodmagic/soulgem4.json b/src/main/resources/data/bloodmagic/advancements/bloodmagic/soulgem4.json new file mode 100644 index 0000000000..4173aef988 --- /dev/null +++ b/src/main/resources/data/bloodmagic/advancements/bloodmagic/soulgem4.json @@ -0,0 +1,34 @@ +{ + "parent": "bloodmagic:bloodmagic/soulgem3", + "criteria": { + "hold_item":{ + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": ["bloodmagic:soulgemgreater"] + } + ] + } + } + }, + "display": { + "icon": { + "item": "bloodmagic:soulgemgreater" + }, + "title": { + "translate": "advancements.bloodmagic.soulgem4.title" + }, + "frame": "task", + "description": { + "translate": "advancements.bloodmagic.soulgem4.description" + }, + "show_toast": false, + "announce_to_chat": true + }, + "requirements": [ + [ + "hold_item" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/advancements/bloodmagic/soulsnare.json b/src/main/resources/data/bloodmagic/advancements/bloodmagic/soulsnare.json new file mode 100644 index 0000000000..e65dc92f42 --- /dev/null +++ b/src/main/resources/data/bloodmagic/advancements/bloodmagic/soulsnare.json @@ -0,0 +1,34 @@ +{ + "parent": "bloodmagic:bloodmagic/root", + "criteria": { + "hold_item":{ + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": ["bloodmagic:soulsnare"] + } + ] + } + } + }, + "display": { + "icon": { + "item": "bloodmagic:soulsnare" + }, + "title": { + "translate": "advancements.bloodmagic.soulsnare.title" + }, + "frame": "task", + "description": { + "translate": "advancements.bloodmagic.soulsnare.description" + }, + "show_toast": false, + "announce_to_chat": false + }, + "requirements": [ + [ + "hold_item" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/advancements/bloodmagic/soulsword.json b/src/main/resources/data/bloodmagic/advancements/bloodmagic/soulsword.json new file mode 100644 index 0000000000..d27639ddfa --- /dev/null +++ b/src/main/resources/data/bloodmagic/advancements/bloodmagic/soulsword.json @@ -0,0 +1,34 @@ +{ + "parent": "bloodmagic:bloodmagic/soulgem1", + "criteria": { + "hold_item":{ + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": ["bloodmagic:soulsword"] + } + ] + } + } + }, + "display": { + "icon": { + "item": "bloodmagic:soulsword" + }, + "title": { + "translate": "advancements.bloodmagic.soulsword.title" + }, + "frame": "task", + "description": { + "translate": "advancements.bloodmagic.soulsword.description" + }, + "show_toast": false, + "announce_to_chat": false + }, + "requirements": [ + [ + "hold_item" + ] + ] +} \ No newline at end of file