Fix wrong material requirement for material master (#5049), add bambo…

…o to requirement
SlimeKnights · Jan 4, 2023 · ecb4891 · ecb4891
1 parent 53757f7
commit ecb4891
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 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
@@ -120,6 +120,19 @@
         ]
       }
     },
+    "bamboo": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "type": "tconstruct:tool",
+            "materials": [
+              "tconstruct:bamboo"
+            ]
+          }
+        ]
+      }
+    },
     "iron": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
@@ -250,14 +263,14 @@
         ]
       }
     },
-    "bronze": {
+    "amethyst_bronze": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
             "type": "tconstruct:tool",
             "materials": [
-              "tconstruct:bronze"
+              "tconstruct:amethyst_bronze"
             ]
           }
         ]
@@ -406,6 +419,9 @@
     [
       "vine"
     ],
+    [
+      "bamboo"
+    ],
     [
       "iron"
     ],
@@ -437,7 +453,7 @@
       "nahuatl"
     ],
     [
-      "bronze"
+      "amethyst_bronze"
     ],
     [
       "pig_iron"

diff --git a/src/main/java/slimeknights/tconstruct/common/data/AdvancementsProvider.java b/src/main/java/slimeknights/tconstruct/common/data/AdvancementsProvider.java
@@ -117,6 +117,7 @@ protected void generate() {
       with.accept(MaterialIds.leather);
       with.accept(MaterialIds.string);
       with.accept(MaterialIds.vine);
+      with.accept(MaterialIds.bamboo);
       // tier 2
       with.accept(MaterialIds.iron);
       with.accept(MaterialIds.searedStone);
@@ -129,7 +130,7 @@ protected void generate() {
       with.accept(MaterialIds.roseGold);
       with.accept(MaterialIds.slimesteel);
       with.accept(MaterialIds.nahuatl);
-      with.accept(MaterialIds.bronze);
+      with.accept(MaterialIds.amethystBronze);
       with.accept(MaterialIds.pigIron);
       with.accept(MaterialIds.cobalt);
       with.accept(MaterialIds.darkthread);