updated advancement display, bit more stuff

DaFuqs · Jan 2, 2025 · 9c1ec7d · 9c1ec7d
1 parent ccd876a
commit 9c1ec7d
Show file tree

Hide file tree

Showing 174 changed files with 1,732 additions and 889 deletions.
diff --git a/src/main/resources/data/spectrum/advancement/ascend_kindling.json b/src/main/resources/data/spectrum/advancement/ascend_kindling.json
@@ -2,7 +2,7 @@
   "parent": "spectrum:remember_kindling",
   "display": {
     "icon": {
-      "item": "spectrum:raw_bloodstone"
+      "id": "spectrum:raw_bloodstone"
     },
     "hidden": true,
     "frame": "challenge",

diff --git a/src/main/resources/data/spectrum/advancement/break_cracked_dragonbone.json b/src/main/resources/data/spectrum/advancement/break_cracked_dragonbone.json
@@ -2,7 +2,7 @@
   "parent": "spectrum:spectrum",
   "display": {
     "icon": {
-      "item": "spectrum:dragonbone_chunk"
+      "id": "spectrum:dragonbone_chunk"
     },
     "hidden": true,
     "title": {

diff --git a/src/main/resources/data/spectrum/advancement/break_gemstone_ore.json b/src/main/resources/data/spectrum/advancement/break_gemstone_ore.json
@@ -2,7 +2,7 @@
   "parent": "spectrum:collect_any_basic_shard",
   "display": {
     "icon": {
-      "item": "spectrum:amethyst_ore"
+      "id": "spectrum:amethyst_ore"
     },
     "hidden": true,
     "title": {

diff --git a/src/main/resources/data/spectrum/advancement/build_basic_pedestal_structure.json b/src/main/resources/data/spectrum/advancement/build_basic_pedestal_structure.json
@@ -1,7 +1,7 @@
 {
   "display": {
     "icon": {
-      "item": "spectrum:chiseled_polished_basalt"
+      "id": "spectrum:chiseled_polished_basalt"
     },
     "frame": "challenge",
     "title": {

diff --git a/src/main/resources/data/spectrum/advancement/build_fusion_shrine.json b/src/main/resources/data/spectrum/advancement/build_fusion_shrine.json
@@ -1,7 +1,7 @@
 {
   "display": {
     "icon": {
-      "item": "spectrum:fusion_shrine_basalt"
+      "id": "spectrum:fusion_shrine_basalt"
     },
     "title": {
       "translate": "advancements.spectrum.build_fusion_shrine.title"
@@ -14,11 +14,15 @@
   "criteria": {
     "built_structure": {
       "trigger": "spectrum:completed_multiblock",
-      "conditions": { "multiblock_identifier": "spectrum:fusion_shrine" }
+      "conditions": {
+        "multiblock_identifier": "spectrum:fusion_shrine"
+      }
     },
     "gotten_previous": {
-      "trigger":"revelationary:advancement_gotten",
-      "conditions": { "advancement_identifier": "spectrum:collect_all_basic_pigments_besides_brown" }
+      "trigger": "revelationary:advancement_gotten",
+      "conditions": {
+        "advancement_identifier": "spectrum:collect_all_basic_pigments_besides_brown"
+      }
     }
   },
   "rewards": {

diff --git a/src/main/resources/data/spectrum/advancement/catch_shooting_star.json b/src/main/resources/data/spectrum/advancement/catch_shooting_star.json
@@ -2,7 +2,7 @@
   "parent": "spectrum:collect_star_fragment",
   "display": {
     "icon": {
-      "item": "spectrum:glistering_shooting_star"
+      "id": "spectrum:glistering_shooting_star"
     },
     "frame": "challenge",
     "hidden": true,
@@ -18,8 +18,10 @@
       "trigger": "minecraft:impossible"
     },
     "gotten_previous": {
-      "trigger":"revelationary:advancement_gotten",
-      "conditions": { "advancement_identifier": "spectrum:collect_all_basic_pigments" }
+      "trigger": "revelationary:advancement_gotten",
+      "conditions": {
+        "advancement_identifier": "spectrum:collect_all_basic_pigments"
+      }
     }
   },
   "rewards": {

diff --git a/src/main/resources/data/spectrum/advancement/collect_all_basic_pigments.json b/src/main/resources/data/spectrum/advancement/collect_all_basic_pigments.json
@@ -1,7 +1,7 @@
 {
   "display": {
     "icon": {
-      "item": "spectrum:magenta_pigment"
+      "id": "spectrum:magenta_pigment"
     },
     "frame": "goal",
     "title": {
@@ -14,80 +14,82 @@
   "parent": "spectrum:collect_pigment",
   "criteria": {
     "collected_blue_pigment": {
-      "trigger":"revelationary:advancement_gotten",
+      "trigger": "revelationary:advancement_gotten",
       "conditions": {
         "advancement_identifier": "spectrum:hidden/collect_pigment/blue"
       }
     },
     "collected_cyan_pigment": {
-      "trigger":"revelationary:advancement_gotten",
+      "trigger": "revelationary:advancement_gotten",
       "conditions": {
         "advancement_identifier": "spectrum:hidden/collect_pigment/cyan"
       }
     },
     "collected_green_pigment": {
-      "trigger":"revelationary:advancement_gotten",
+      "trigger": "revelationary:advancement_gotten",
       "conditions": {
         "advancement_identifier": "spectrum:hidden/collect_pigment/green"
       }
     },
     "collected_light_blue_pigment": {
-      "trigger":"revelationary:advancement_gotten",
+      "trigger": "revelationary:advancement_gotten",
       "conditions": {
         "advancement_identifier": "spectrum:hidden/collect_pigment/light_blue"
       }
     },
     "collected_lime_pigment": {
-      "trigger":"revelationary:advancement_gotten",
+      "trigger": "revelationary:advancement_gotten",
       "conditions": {
         "advancement_identifier": "spectrum:hidden/collect_pigment/lime"
       }
     },
     "collected_magenta_pigment": {
-      "trigger":"revelationary:advancement_gotten",
+      "trigger": "revelationary:advancement_gotten",
       "conditions": {
         "advancement_identifier": "spectrum:hidden/collect_pigment/magenta"
       }
     },
     "collected_orange_pigment": {
-      "trigger":"revelationary:advancement_gotten",
+      "trigger": "revelationary:advancement_gotten",
       "conditions": {
         "advancement_identifier": "spectrum:hidden/collect_pigment/orange"
       }
     },
     "collected_pink_pigment": {
-      "trigger":"revelationary:advancement_gotten",
+      "trigger": "revelationary:advancement_gotten",
       "conditions": {
         "advancement_identifier": "spectrum:hidden/collect_pigment/pink"
       }
     },
     "collected_purple_pigment": {
-      "trigger":"revelationary:advancement_gotten",
+      "trigger": "revelationary:advancement_gotten",
       "conditions": {
         "advancement_identifier": "spectrum:hidden/collect_pigment/purple"
       }
     },
     "collected_red_pigment": {
-      "trigger":"revelationary:advancement_gotten",
+      "trigger": "revelationary:advancement_gotten",
       "conditions": {
         "advancement_identifier": "spectrum:hidden/collect_pigment/red"
       }
     },
     "collected_yellow_pigment": {
-      "trigger":"revelationary:advancement_gotten",
+      "trigger": "revelationary:advancement_gotten",
       "conditions": {
         "advancement_identifier": "spectrum:hidden/collect_pigment/yellow"
       }
     },
     "collected_brown_pigment": {
-      "trigger":"revelationary:advancement_gotten",
+      "trigger": "revelationary:advancement_gotten",
       "conditions": {
         "advancement_identifier": "spectrum:hidden/collect_pigment/brown"
       }
     },
     "gotten_previous": {
-      "trigger":"revelationary:advancement_gotten",
-      "conditions": { "advancement_identifier": "spectrum:collect_pigment" }
+      "trigger": "revelationary:advancement_gotten",
+      "conditions": {
+        "advancement_identifier": "spectrum:collect_pigment"
+      }
     }
   }
 }
diff --git a/src/main/resources/data/spectrum/advancement/collect_all_basic_pigments_besides_brown.json b/src/main/resources/data/spectrum/advancement/collect_all_basic_pigments_besides_brown.json
@@ -1,7 +1,7 @@
 {
   "display": {
     "icon": {
-      "item": "spectrum:brown_pigment"
+      "id": "spectrum:brown_pigment"
     },
     "frame": "goal",
     "hidden": true,
@@ -15,74 +15,76 @@
   "parent": "spectrum:collect_pigment",
   "criteria": {
     "collected_blue_pigment": {
-      "trigger":"revelationary:advancement_gotten",
+      "trigger": "revelationary:advancement_gotten",
       "conditions": {
         "advancement_identifier": "spectrum:hidden/collect_pigment/blue"
       }
     },
     "collected_cyan_pigment": {
-      "trigger":"revelationary:advancement_gotten",
+      "trigger": "revelationary:advancement_gotten",
       "conditions": {
         "advancement_identifier": "spectrum:hidden/collect_pigment/cyan"
       }
     },
     "collected_green_pigment": {
-      "trigger":"revelationary:advancement_gotten",
+      "trigger": "revelationary:advancement_gotten",
       "conditions": {
         "advancement_identifier": "spectrum:hidden/collect_pigment/green"
       }
     },
     "collected_light_blue_pigment": {
-      "trigger":"revelationary:advancement_gotten",
+      "trigger": "revelationary:advancement_gotten",
       "conditions": {
         "advancement_identifier": "spectrum:hidden/collect_pigment/light_blue"
       }
     },
     "collected_lime_pigment": {
-      "trigger":"revelationary:advancement_gotten",
+      "trigger": "revelationary:advancement_gotten",
       "conditions": {
         "advancement_identifier": "spectrum:hidden/collect_pigment/lime"
       }
     },
     "collected_magenta_pigment": {
-      "trigger":"revelationary:advancement_gotten",
+      "trigger": "revelationary:advancement_gotten",
       "conditions": {
         "advancement_identifier": "spectrum:hidden/collect_pigment/magenta"
       }
     },
     "collected_orange_pigment": {
-      "trigger":"revelationary:advancement_gotten",
+      "trigger": "revelationary:advancement_gotten",
       "conditions": {
         "advancement_identifier": "spectrum:hidden/collect_pigment/orange"
       }
     },
     "collected_pink_pigment": {
-      "trigger":"revelationary:advancement_gotten",
+      "trigger": "revelationary:advancement_gotten",
       "conditions": {
         "advancement_identifier": "spectrum:hidden/collect_pigment/pink"
       }
     },
     "collected_purple_pigment": {
-      "trigger":"revelationary:advancement_gotten",
+      "trigger": "revelationary:advancement_gotten",
       "conditions": {
         "advancement_identifier": "spectrum:hidden/collect_pigment/purple"
       }
     },
     "collected_red_pigment": {
-      "trigger":"revelationary:advancement_gotten",
+      "trigger": "revelationary:advancement_gotten",
       "conditions": {
         "advancement_identifier": "spectrum:hidden/collect_pigment/red"
       }
     },
     "collected_yellow_pigment": {
-      "trigger":"revelationary:advancement_gotten",
+      "trigger": "revelationary:advancement_gotten",
       "conditions": {
         "advancement_identifier": "spectrum:hidden/collect_pigment/yellow"
       }
     },
     "gotten_previous": {
-      "trigger":"revelationary:advancement_gotten",
-      "conditions": { "advancement_identifier": "spectrum:collect_pigment" }
+      "trigger": "revelationary:advancement_gotten",
+      "conditions": {
+        "advancement_identifier": "spectrum:collect_pigment"
+      }
     }
   }
 }
diff --git a/src/main/resources/data/spectrum/advancement/collect_all_basic_shards.json b/src/main/resources/data/spectrum/advancement/collect_all_basic_shards.json
@@ -1,7 +1,7 @@
 {
   "display": {
     "icon": {
-      "item": "minecraft:amethyst_shard"
+      "id": "minecraft:amethyst_shard"
     },
     "frame": "goal",
     "title": {

diff --git a/src/main/resources/data/spectrum/advancement/collect_all_shooting_star_variants.json b/src/main/resources/data/spectrum/advancement/collect_all_shooting_star_variants.json
@@ -1,7 +1,7 @@
 {
   "display": {
     "icon": {
-      "item": "spectrum:gemstone_shooting_star"
+      "id": "spectrum:gemstone_shooting_star"
     },
     "frame": "goal",
     "title": {
@@ -14,7 +14,7 @@
   "parent": "spectrum:collect_star_fragment",
   "criteria": {
     "has_glistering_shooting_star": {
-      "trigger":"minecraft:inventory_changed",
+      "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
@@ -24,7 +24,7 @@
       }
     },
     "has_fiery_shooting_star": {
-      "trigger":"minecraft:inventory_changed",
+      "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
@@ -34,7 +34,7 @@
       }
     },
     "has_colorful_shooting_star": {
-      "trigger":"minecraft:inventory_changed",
+      "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
@@ -44,7 +44,7 @@
       }
     },
     "has_pristine_shooting_star": {
-      "trigger":"minecraft:inventory_changed",
+      "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
@@ -54,7 +54,7 @@
       }
     },
     "has_gemstone_shooting_star": {
-      "trigger":"minecraft:inventory_changed",
+      "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
@@ -64,8 +64,10 @@
       }
     },
     "gotten_previous": {
-      "trigger":"revelationary:advancement_gotten",
-      "conditions": { "advancement_identifier": "spectrum:collect_star_fragment" }
+      "trigger": "revelationary:advancement_gotten",
+      "conditions": {
+        "advancement_identifier": "spectrum:collect_star_fragment"
+      }
     }
   }
 }