Update advancement material list

SlimeKnights · Dec 29, 2023 · 090fc8f · 090fc8f
1 parent 4d809a3
commit 090fc8f
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 5 deletions.
diff --git a/src/generated/resources/data/tconstruct/advancements/tools/material_master.json b/src/generated/resources/data/tconstruct/advancements/tools/material_master.json
@@ -142,6 +142,20 @@
         ]
       }
     },
+    "chorus": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "type": "tconstruct:tool_stack",
+            "predicate": {
+              "type": "tconstruct:has_material",
+              "material": "tconstruct:chorus"
+            }
+          }
+        ]
+      }
+    },
     "iron": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
@@ -240,6 +254,20 @@
         ]
       }
     },
+    "whitestone": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "type": "tconstruct:tool_stack",
+            "predicate": {
+              "type": "tconstruct:has_material",
+              "material": "tconstruct:whitestone"
+            }
+          }
+        ]
+      }
+    },
     "rose_gold": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
@@ -451,6 +479,9 @@
     [
       "bamboo"
     ],
+    [
+      "chorus"
+    ],
     [
       "iron"
     ],
@@ -472,6 +503,9 @@
     [
       "skyslime_vine"
     ],
+    [
+      "whitestone"
+    ],
     [
       "rose_gold"
     ],

diff --git a/src/main/java/slimeknights/tconstruct/common/data/AdvancementsProvider.java b/src/main/java/slimeknights/tconstruct/common/data/AdvancementsProvider.java
@@ -134,6 +134,7 @@ protected void generate() {
       with.accept(MaterialIds.string);
       with.accept(MaterialIds.vine);
       with.accept(MaterialIds.bamboo);
+      with.accept(MaterialIds.chorus);
       // tier 2
       with.accept(MaterialIds.iron);
       with.accept(MaterialIds.searedStone);
@@ -142,6 +143,7 @@ protected void generate() {
       with.accept(MaterialIds.slimewood);
       with.accept(MaterialIds.chain);
       with.accept(MaterialIds.skyslimeVine);
+      with.accept(MaterialIds.whitestone);
       // tier 3
       with.accept(MaterialIds.roseGold);
       with.accept(MaterialIds.slimesteel);
@@ -361,15 +363,15 @@ protected void generate() {
     Advancement tinkersGadgetry = builder(TinkerCommons.tinkersGadgetry, resource("world/tinkers_gadgetry"), materialsAndYou, FrameType.TASK, builder ->
       builder.addCriterion("crafted_book", hasItem(TinkerCommons.tinkersGadgetry)));
     builder(TinkerWorld.slimeSapling.get(SlimeType.EARTH), resource("world/earth_island"), tinkersGadgetry, FrameType.GOAL, builder ->
-      builder.addCriterion("found_island", LocationTrigger.TriggerInstance.located(LocationPredicate.inFeature(TinkerStructures.configuredEarthSlimeIsland.getKey()))));
+      builder.addCriterion("found_island", LocationTrigger.TriggerInstance.located(LocationPredicate.inFeature(Objects.requireNonNull(TinkerStructures.configuredEarthSlimeIsland.getKey())))));
     builder(TinkerWorld.slimeSapling.get(SlimeType.SKY), resource("world/sky_island"), tinkersGadgetry, FrameType.GOAL, builder ->
-      builder.addCriterion("found_island", LocationTrigger.TriggerInstance.located(LocationPredicate.inFeature(TinkerStructures.configuredSkySlimeIsland.getKey()))));
+      builder.addCriterion("found_island", LocationTrigger.TriggerInstance.located(LocationPredicate.inFeature(Objects.requireNonNull(TinkerStructures.configuredSkySlimeIsland.getKey())))));
     builder(TinkerWorld.slimeSapling.get(SlimeType.BLOOD), resource("world/blood_island"), tinkersGadgetry, FrameType.GOAL, builder ->
-      builder.addCriterion("found_island", LocationTrigger.TriggerInstance.located(LocationPredicate.inFeature(TinkerStructures.configuredBloodIsland.getKey()))));
+      builder.addCriterion("found_island", LocationTrigger.TriggerInstance.located(LocationPredicate.inFeature(Objects.requireNonNull(TinkerStructures.configuredBloodIsland.getKey())))));
     Advancement enderslimeIsland = builder(TinkerWorld.slimeSapling.get(SlimeType.ENDER), resource("world/ender_island"), tinkersGadgetry, FrameType.GOAL, builder ->
-      builder.addCriterion("found_island", LocationTrigger.TriggerInstance.located(LocationPredicate.inFeature(TinkerStructures.configuredEndSlimeIsland.getKey()))));
+      builder.addCriterion("found_island", LocationTrigger.TriggerInstance.located(LocationPredicate.inFeature(Objects.requireNonNull(TinkerStructures.configuredEndSlimeIsland.getKey())))));
     builder(Items.CLAY_BALL, resource("world/clay_island"), tinkersGadgetry, FrameType.GOAL, builder ->
-      builder.addCriterion("found_island", LocationTrigger.TriggerInstance.located(LocationPredicate.inFeature(TinkerStructures.configuredClayIsland.getKey()))));
+      builder.addCriterion("found_island", LocationTrigger.TriggerInstance.located(LocationPredicate.inFeature(Objects.requireNonNull(TinkerStructures.configuredClayIsland.getKey())))));
     Advancement slimes = builder(TinkerCommons.slimeball.get(SlimeType.ICHOR), resource("world/slime_collector"), tinkersGadgetry, FrameType.TASK, builder -> {
       for (SlimeType type : SlimeType.values()) {
         builder.addCriterion(type.getSerializedName(), hasTag(type.getSlimeballTag()));