Adjust shield wood

Plate now requires nether wood (non-flammable, non-slimy). Traveler just requires non-slimy (slimy is another material)
SlimeKnights · Feb 13, 2023 · 11be5ca · 11be5ca
1 parent ca8f4d1
commit 11be5ca
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/src/generated/resources/data/tconstruct/recipes/armor/building/plate_shield.json b/src/generated/resources/data/tconstruct/recipes/armor/building/plate_shield.json
@@ -10,7 +10,21 @@
       "tag": "forge:ingots/cobalt"
     },
     "w": {
-      "tag": "minecraft:planks"
+      "type": "forge:difference",
+      "base": {
+        "type": "forge:intersection",
+        "children": [
+          {
+            "tag": "minecraft:planks"
+          },
+          {
+            "tag": "minecraft:non_flammable_wood"
+          }
+        ]
+      },
+      "subtracted": {
+        "tag": "tconstruct:slimy_planks"
+      }
     }
   },
   "result": {

diff --git a/src/generated/resources/data/tconstruct/recipes/armor/building/travelers_shield.json b/src/generated/resources/data/tconstruct/recipes/armor/building/travelers_shield.json
@@ -10,7 +10,13 @@
       "tag": "forge:ingots/copper"
     },
     "w": {
-      "tag": "minecraft:planks"
+      "type": "forge:difference",
+      "base": {
+        "tag": "minecraft:planks"
+      },
+      "subtracted": {
+        "tag": "tconstruct:slimy_planks"
+      }
     }
   },
   "result": {

diff --git a/src/main/java/slimeknights/tconstruct/tools/data/ToolsRecipeProvider.java b/src/main/java/slimeknights/tconstruct/tools/data/ToolsRecipeProvider.java
@@ -11,6 +11,8 @@
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.level.ItemLike;
 import net.minecraftforge.common.Tags;
+import net.minecraftforge.common.crafting.DifferenceIngredient;
+import net.minecraftforge.common.crafting.IntersectionIngredient;
 import slimeknights.mantle.recipe.helper.ItemOutput;
 import slimeknights.tconstruct.common.TinkerTags;
 import slimeknights.tconstruct.common.data.BaseRecipeProvider;
@@ -167,7 +169,7 @@ private void addToolBuildingRecipes(Consumer<FinishedRecipe> consumer) {
                        .pattern("cwc")
                        .pattern(" c ")
                        .define('c', Tags.Items.INGOTS_COPPER)
-                       .define('w', ItemTags.PLANKS)
+                       .define('w', DifferenceIngredient.of(Ingredient.of(ItemTags.PLANKS), Ingredient.of(TinkerTags.Items.SLIMY_PLANKS)))
                        .unlockedBy("has_item", has(Tags.Items.INGOTS_COPPER))
                        .save(consumer, modResource(armorFolder + "travelers_shield"));
     SpecializedRepairRecipeBuilder.repair(Ingredient.of(Streams.concat(TinkerTools.travelersGear.values().stream(), Stream.of(TinkerTools.travelersShield.get())).map(ItemStack::new)), MaterialIds.copper)
@@ -215,7 +217,7 @@ private void addToolBuildingRecipes(Consumer<FinishedRecipe> consumer) {
                        .pattern("cc")
                        .pattern("ww")
                        .define('c', TinkerMaterials.cobalt.getIngotTag())
-                       .define('w', ItemTags.PLANKS)
+                       .define('w', DifferenceIngredient.of(IntersectionIngredient.of(Ingredient.of(ItemTags.PLANKS), Ingredient.of(ItemTags.NON_FLAMMABLE_WOOD)), Ingredient.of(TinkerTags.Items.SLIMY_PLANKS)))
                        .unlockedBy("has_item", has(TinkerMaterials.cobalt.getIngotTag()))
                        .save(consumer, modResource(armorFolder + "plate_shield"));
     SpecializedRepairRecipeBuilder.repair(Ingredient.of(Streams.concat(TinkerTools.plateArmor.values().stream(), Stream.of(TinkerTools.plateShield.asItem())).map(ItemStack::new)), MaterialIds.cobalt)