Implement tag for dyeable modifiable tools

SlimeKnights · Jan 13, 2023 · f6c3bdd · f6c3bdd
1 parent d838aaa
commit f6c3bdd
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 16 deletions.
diff --git a/...enerated/resources/data/tconstruct/recipes/tools/modifiers/slotless/travelers_dyeing.json b/...enerated/resources/data/tconstruct/recipes/tools/modifiers/slotless/travelers_dyeing.json
@@ -1,17 +1,6 @@
 {
   "type": "tconstruct:armor_dyeing_modifier",
-  "tools": [
-    {
-      "item": "tconstruct:travelers_boots"
-    },
-    {
-      "item": "tconstruct:travelers_leggings"
-    },
-    {
-      "item": "tconstruct:travelers_chestplate"
-    },
-    {
-      "item": "tconstruct:travelers_helmet"
-    }
-  ]
+  "tools": {
+    "tag": "tconstruct:modifiable/dyeable"
+  }
 }
diff --git a/src/generated/resources/data/tconstruct/tags/items/modifiable/dyeable.json b/src/generated/resources/data/tconstruct/tags/items/modifiable/dyeable.json
@@ -0,0 +1,9 @@
+{
+  "replace": false,
+  "values": [
+    "tconstruct:travelers_boots",
+    "tconstruct:travelers_leggings",
+    "tconstruct:travelers_chestplate",
+    "tconstruct:travelers_helmet"
+  ]
+}
diff --git a/src/main/java/slimeknights/tconstruct/common/TinkerTags.java b/src/main/java/slimeknights/tconstruct/common/TinkerTags.java
@@ -362,6 +362,8 @@ private static void init() {}
     public static final TagKey<Item> EMBELLISHMENT_METAL = tag("modifiable/embellishment/metal");
     /** Tools that can receive slime based embellishments */
     public static final TagKey<Item> EMBELLISHMENT_SLIME = tag("modifiable/embellishment/slime");
+    /** Tools that can be dyed */
+    public static final TagKey<Item> DYEABLE = tag("modifiable/dyeable");
 
     /** Tag so mods like thermal know our scyhtes can harvest */
     public static final TagKey<Item> SCYTHES = forgeTag("tools/scythe");

diff --git a/src/main/java/slimeknights/tconstruct/common/data/tags/ItemTagProvider.java b/src/main/java/slimeknights/tconstruct/common/data/tags/ItemTagProvider.java
@@ -44,6 +44,7 @@
 import static slimeknights.tconstruct.common.TinkerTags.Items.CHESTPLATES;
 import static slimeknights.tconstruct.common.TinkerTags.Items.CROSSBOWS;
 import static slimeknights.tconstruct.common.TinkerTags.Items.DURABILITY;
+import static slimeknights.tconstruct.common.TinkerTags.Items.DYEABLE;
 import static slimeknights.tconstruct.common.TinkerTags.Items.EMBELLISHMENT_METAL;
 import static slimeknights.tconstruct.common.TinkerTags.Items.EMBELLISHMENT_SLIME;
 import static slimeknights.tconstruct.common.TinkerTags.Items.HARVEST;
@@ -238,7 +239,7 @@ private void addTools() {
     addToolTags(TinkerTools.flintAndBrick, DURABILITY, MELEE, ONE_HANDED, AOE);
 
     // armor
-    addArmorTags(TinkerTools.travelersGear, DURABILITY, ItemTags.FREEZE_IMMUNE_WEARABLES);
+    addArmorTags(TinkerTools.travelersGear, DURABILITY, DYEABLE, ItemTags.FREEZE_IMMUNE_WEARABLES);
     addArmorTags(TinkerTools.plateArmor,    DURABILITY, EMBELLISHMENT_METAL);
     addArmorTags(TinkerTools.slimesuit,     DURABILITY, EMBELLISHMENT_SLIME);
     addToolTags(TinkerTools.slimesuit.get(ArmorSlotType.HELMET), MULTIPART_TOOL);

diff --git a/src/main/java/slimeknights/tconstruct/tools/data/ModifierRecipeProvider.java b/src/main/java/slimeknights/tconstruct/tools/data/ModifierRecipeProvider.java
@@ -1418,7 +1418,7 @@ private void addTextureRecipes(Consumer<FinishedRecipe> consumer) {
     String folder = "tools/modifiers/slotless/";
 
     // travelers gear //
-    consumer.accept(new ArmorDyeingRecipe.Finished(modResource(folder + "travelers_dyeing"), Ingredient.of(TinkerTools.travelersGear.values().stream().map(ItemStack::new))));
+    consumer.accept(new ArmorDyeingRecipe.Finished(modResource(folder + "travelers_dyeing"), Ingredient.of(TinkerTags.Items.DYEABLE)));
 
     // plate //
     // tier 2