From b95d777e54bbd1b500f07ab8866644bd34c51dec Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Wed, 13 Aug 2025 14:52:38 -0400 Subject: [PATCH] Add support for the Blood Iron Caps from Blood Arsenal. They now reduce the LP cost for the blood cores' regen and cause the Weakness 3 effect when used as a weapon just like the Alchemical Caps. Blood Wood Cores already match the .startsWith("blood") for the Weakness check and have their own logic for blood iron caps, so nothing needs to be changed to support them. --- src/main/java/fox/spiteful/forbidden/FMEventHandler.java | 3 ++- .../fox/spiteful/forbidden/items/wands/BloodStaffUpdate.java | 3 ++- .../fox/spiteful/forbidden/items/wands/BloodWandUpdate.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/fox/spiteful/forbidden/FMEventHandler.java b/src/main/java/fox/spiteful/forbidden/FMEventHandler.java index 1a11cca..a435afa 100644 --- a/src/main/java/fox/spiteful/forbidden/FMEventHandler.java +++ b/src/main/java/fox/spiteful/forbidden/FMEventHandler.java @@ -498,7 +498,8 @@ public class FMEventHandler { if (event.source.getEntity() != null && event.source.getEntity() instanceof EntityPlayer) { ItemStack equip = ((EntityPlayer) event.source.getEntity()).getCurrentEquippedItem(); if (equip != null && equip.getItem() instanceof ItemWandCasting) { - if (((ItemWandCasting) equip.getItem()).getCap(equip).getTag().equals("alchemical") + String capTag = ((ItemWandCasting) equip.getItem()).getCap(equip).getTag(); + if (capTag.equals("alchemical") || capTag.equals("blood_iron") && ((ItemWandCasting) equip.getItem()).getRod(equip).getTag().startsWith("blood")) { event.entityLiving.addPotionEffect(new PotionEffect(Potion.weakness.id, 60, 2)); } diff --git a/src/main/java/fox/spiteful/forbidden/items/wands/BloodStaffUpdate.java b/src/main/java/fox/spiteful/forbidden/items/wands/BloodStaffUpdate.java index 72d450f..ce90032 100644 --- a/src/main/java/fox/spiteful/forbidden/items/wands/BloodStaffUpdate.java +++ b/src/main/java/fox/spiteful/forbidden/items/wands/BloodStaffUpdate.java @@ -23,7 +23,8 @@ public class BloodStaffUpdate implements IWandRodOnUpdate { SoulNetworkHandler.checkAndSetItemOwner(itemstack, player); int cost; - if (((ItemWandCasting) itemstack.getItem()).getCap(itemstack).getTag().equals("alchemical")) + String capTag = ((ItemWandCasting) itemstack.getItem()).getCap(itemstack).getTag(); + if (capTag.equals("alchemical") || capTag.equals("blood_iron")) cost = Config.bloodvis - 1; else cost = Config.bloodvis; diff --git a/src/main/java/fox/spiteful/forbidden/items/wands/BloodWandUpdate.java b/src/main/java/fox/spiteful/forbidden/items/wands/BloodWandUpdate.java index 54085f0..cf91d95 100644 --- a/src/main/java/fox/spiteful/forbidden/items/wands/BloodWandUpdate.java +++ b/src/main/java/fox/spiteful/forbidden/items/wands/BloodWandUpdate.java @@ -20,7 +20,8 @@ public class BloodWandUpdate implements IWandRodOnUpdate { SoulNetworkHandler.checkAndSetItemOwner(itemstack, player); int cost; - if (((ItemWandCasting) itemstack.getItem()).getCap(itemstack).getTag().equals("alchemical")) + String capTag = ((ItemWandCasting) itemstack.getItem()).getCap(itemstack).getTag(); + if (capTag.equals("alchemical") || capTag.equals("blood_iron")) cost = Config.bloodvis - 1; else cost = Config.bloodvis;