diff --git a/Xplat/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ManasteelArmorItem.java b/Xplat/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ManasteelArmorItem.java index c6ba00e8c3..fdb6ec9420 100644 --- a/Xplat/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ManasteelArmorItem.java +++ b/Xplat/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ManasteelArmorItem.java @@ -43,8 +43,6 @@ public class ManasteelArmorItem extends ArmorItem implements CustomDamageItem, PhantomInkable { - private static final int MANA_PER_DAMAGE = 70; - private static final String TAG_PHANTOM_INK = "phantomInk"; public final Type type; @@ -61,7 +59,7 @@ public ManasteelArmorItem(Type type, ArmorMaterial mat, Properties props) { @Override public void inventoryTick(ItemStack stack, Level world, Entity entity, int slot, boolean selected) { if (entity instanceof Player player) { - if (!world.isClientSide && stack.getDamageValue() > 0 && ManaItemHandler.instance().requestManaExact(stack, player, MANA_PER_DAMAGE * 2, true)) { + if (!world.isClientSide && stack.getDamageValue() > 0 && ManaItemHandler.instance().requestManaExact(stack, player, getManaPerDamage() * 2, true)) { stack.setDamageValue(stack.getDamageValue() - 1); } } @@ -69,7 +67,11 @@ public void inventoryTick(ItemStack stack, Level world, Entity entity, int slot, @Override public int damageItem(ItemStack stack, int amount, T entity, Consumer onBroken) { - return ToolCommons.damageItemIfPossible(stack, amount, entity, MANA_PER_DAMAGE); + return ToolCommons.damageItemIfPossible(stack, amount, entity, getManaPerDamage()); + } + + protected int getManaPerDamage() { + return 70; } @SoftImplement("IForgeItem") diff --git a/Xplat/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ManaweaveHelmItem.java b/Xplat/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ManaweaveHelmItem.java index 207a163c53..3f7cca9867 100644 --- a/Xplat/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ManaweaveHelmItem.java +++ b/Xplat/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ManaweaveHelmItem.java @@ -8,26 +8,17 @@ */ package vazkii.botania.common.item.equipment.armor.manaweave; -import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; -import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.Level; import org.jetbrains.annotations.Nullable; import vazkii.botania.api.item.ManaProficiencyArmor; import vazkii.botania.api.mana.ManaDiscountArmor; -import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.common.item.equipment.tool.ToolCommons; - -import java.util.function.Consumer; public class ManaweaveHelmItem extends ManaweaveArmorItem implements ManaDiscountArmor, ManaProficiencyArmor { - private static final int MANA_PER_DAMAGE = 30; - public ManaweaveHelmItem(Properties props) { super(Type.HELMET, props); } @@ -43,16 +34,7 @@ public boolean shouldGiveProficiency(ItemStack stack, EquipmentSlot slot, Player } @Override - public void inventoryTick(ItemStack stack, Level world, Entity entity, int slot, boolean selected) { - if (entity instanceof Player player) { - if (!world.isClientSide && stack.getDamageValue() > 0 && ManaItemHandler.instance().requestManaExact(stack, player, MANA_PER_DAMAGE * 2, true)) { - stack.setDamageValue(stack.getDamageValue() - 1); - } - } - } - - @Override - public int damageItem(ItemStack stack, int amount, T entity, Consumer onBroken) { - return ToolCommons.damageItemIfPossible(stack, amount, entity, MANA_PER_DAMAGE); + protected int getManaPerDamage() { + return 30; } }