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 0000000..0c0bdb2 Binary files /dev/null and b/src/main/resources/assets/forbidden/textures/items/wand_rod_equivalent.png differ