From 4a630c3e9918190c0c94e86c3da83e53750727bd Mon Sep 17 00:00:00 2001
From: BlakeTech <16453726+BlakeTech@users.noreply.github.com>
Date: Sat, 17 Jun 2023 03:10:37 -0700
Subject: [PATCH] Extended crafting recipe tweaks (#374)

Changes a few recipes in Extended Crafting to fix/allow NBT-insignificant similar items to be used.
Specifically, Watering Cans Range setting is ignored, and the log type required for the Skullfire Sword is no longer specific to Oak.

/* Commits: */

* Changes the NBT tag required for the Creative Watering Can to use the default radius the watering can recipes output.

* Allows all types of logs to be used for the SkullFire Sword Recipe

---------

Co-authored-by: Jtex <58648760+Jtecx@users.noreply.github.com>
Co-authored-by: IntegerLimit <103940576+IntegerLimit@users.noreply.github.com>
---
 overrides/scripts/extendedcrafting.zs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/overrides/scripts/extendedcrafting.zs b/overrides/scripts/extendedcrafting.zs
index f077a12..99da887 100644
--- a/overrides/scripts/extendedcrafting.zs
+++ b/overrides/scripts/extendedcrafting.zs
@@ -567,7 +567,7 @@ makeExtremeRecipe9(<avaritia:skullfire_sword>,
      "N        "],
     { A : <ore:ingotCrystalMatrix>,
       B : <armorplus:material:2>,
-      C : <minecraft:log>,
+      C : <minecraft:log:*>,
       D : <armorplus:redstone_sword>,
       E : <armorplus:lapis_sword>,
       F : <armorplus:emerald_sword>,
@@ -720,10 +720,10 @@ makeExtremeRecipe9(<thermalcultivation:watering_can:32000>,
      "    CCC  ",
      "         "],
     { A : <thermalcultivation:watering_can>.withTag({Water:0, Mode:0}, false),
-      B : <thermalcultivation:watering_can:1>.withTag({Water:0, Mode:0}, false),
-      C : <thermalcultivation:watering_can:2>.withTag({Water:0, Mode:0}, false),
-      D : <thermalcultivation:watering_can:3>.withTag({Water:0, Mode:0}, false),
-      E : <thermalcultivation:watering_can:4>.withTag({Water:0, Mode:0}, false),
+      B : <thermalcultivation:watering_can:1>.withTag({Water:0, Mode:1}, false),
+      C : <thermalcultivation:watering_can:2>.withTag({Water:0, Mode:2}, false),
+      D : <thermalcultivation:watering_can:3>.withTag({Water:0, Mode:3}, false),
+      E : <thermalcultivation:watering_can:4>.withTag({Water:0, Mode:4}, false),
       I : <avaritia:resource:5>});
 
 makeExtremeRecipe9(<solarflux:solar_panel_infinity>,