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.
VT-14 · Oct 13, 2023 · 00de23b · 00de23b
1 parent 8f77874
commit 00de23b
Show file tree

Hide file tree

Showing 14 changed files with 528 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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"
+    ]
+  ]
+}
diff --git a/src/main/resources/data/bloodmagic/advancements/bloodmagic/altar_four.json 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"
+    ]
+  ]
+}
diff --git a/src/main/resources/data/bloodmagic/advancements/bloodmagic/altar_three.json 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"
+    ]
+  ]
+}
diff --git a/src/main/resources/data/bloodmagic/advancements/bloodmagic/altar_two.json 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"
+    ]
+  ]
+}
diff --git a/src/main/resources/data/bloodmagic/advancements/bloodmagic/demonwill.json 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"
+    ]
+  ]
+}
diff --git 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"
     ]
   ]
 }