From f297080a5352ca7d77ec3a94c12b4dee97576a1b Mon Sep 17 00:00:00 2001
From: koolkrafter5 <creepersrgreen@gmail.com>
Date: Tue, 12 Aug 2025 22:16:23 -0400
Subject: [PATCH] Make a new item for the Equivalent Exchange compat wand rod
 so it doesn't interfere with a new Salis Arcana feature. This wand is still
 not functional, since this is just a placeholder item for now. Item art is
 based on the Inert Blood Rod and the Equivalent wand rod model that already
 existed. Also took the opportunity to hide this wand behind the EE3 check so
 it no longer shows up in NEI when that mod is not present.

---
 .../spiteful/forbidden/items/ForbiddenItems.java  |   2 +-
 .../forbidden/items/wands/ItemWandCores.java      |  10 ++++++----
 .../resources/assets/forbidden/lang/en_US.lang    |   1 +
 .../textures/items/wand_rod_equivalent.png        | Bin 0 -> 258 bytes
 4 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 src/main/resources/assets/forbidden/textures/items/wand_rod_equivalent.png

diff --git a/src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java b/src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java
index 6492ca7..aa3045e 100644
--- a/src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java
+++ b/src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java
@@ -201,7 +201,7 @@ public class ForbiddenItems {
         WAND_ROD_EQUIVALENT = new WandRod(
                 "equivalent",
                 100,
-                new ItemStack(wandCore, 1, 11),
+                new ItemStack(wandCore, 1, 14),
                 12,
                 new ResourceLocation("forbidden", "textures/models/wand_rod_equivalent.png"));
         WAND_ROD_PROFANE = new WandRod(
diff --git a/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java b/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java
index 7abb3b2..64b26f6 100644
--- a/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java
+++ b/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java
@@ -24,7 +24,7 @@ public class ItemWandCores extends Item {
 
     public final String[] types = { "tainted", "infernal", "soul", "blood", "witchwood", "profane", "blood_inert",
             "livingwood", "livingwood_inert", "blood_staff", "witchwood_staff", "dreamwood", "dreamwood_inert",
-            "dreamwood_staff" };
+            "dreamwood_staff", "equivalent" };
     public IIcon[] icon;
 
     public ItemWandCores() {
@@ -116,9 +116,11 @@ public class ItemWandCores extends Item {
             ((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("wood"));
             list.add(wand);
         }
-        wand = new ItemStack(ConfigItems.itemWandCasting, 1, 84);
-        ((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("void"));
-        ((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("equivalent"));
+        if (Compat.ee3 && Config.crossWand) {
+            wand = new ItemStack(ConfigItems.itemWandCasting, 1, 84);
+            ((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("void"));
+            ((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("equivalent"));
+        }
         list.add(wand);
     }
 
diff --git a/src/main/resources/assets/forbidden/lang/en_US.lang b/src/main/resources/assets/forbidden/lang/en_US.lang
index 8afb852..8c039b3 100644
--- a/src/main/resources/assets/forbidden/lang/en_US.lang
+++ b/src/main/resources/assets/forbidden/lang/en_US.lang
@@ -84,6 +84,7 @@ item.WandCores.witchwood_staff.name=Witchwood Staff Core
 item.WandCores.dreamwood.name=Dreamwood Rod
 item.WandCores.dreamwood_inert.name=Silent Dreamwood Rod
 item.WandCores.dreamwood_staff.name=Dreamwood Staff Core
+item.WandCores.equivalent.name=§kAlchemical§r Rod
 item.WandCaps.name=Wand Cap
 item.WandCaps.alchemical.name=Alchemical Cap
 item.WandCaps.vinteum.name=Vinteum Cap
diff --git a/src/main/resources/assets/forbidden/textures/items/wand_rod_equivalent.png b/src/main/resources/assets/forbidden/textures/items/wand_rod_equivalent.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c0bdb243e8d8b7c6b1da2f100ac776eaae50035
GIT binary patch
literal 258
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`)Ym%P6qOKdb&7<
zSoB_<w3hFXfk1;jhvS+ypEDCgqR;qzv|&2m^i1)?p2I9s{j(FYrg_%z3b!jLPq>>f
zxn|YQFT3ygKU}}zTG!UFd&!FxKh+kqCRD`)gofseKcACQs1wEd*v_c^xn<X)Yo{mY
zZ~7j`z|<H!DPUUa>Nn@?E}2Zd{fp_qpFK+Fi@&au`f|_v20O!<YbB?$n4ZsJkVszf
zde$P1Hh=5x<ji0Hk7`$Mett8Pa{-@^b8K?_Pv*Ci|FH9msyb_bt$7dfErX}4pUXO@
GgeCxC#B419

literal 0
HcmV?d00001