From e51eb07dc3ae6d815b8c079ecc1c30eee7e868a0 Mon Sep 17 00:00:00 2001 From: Hubry Date: Mon, 13 Jan 2020 14:55:31 +0100 Subject: [PATCH] Use damage hook for mana consumption, let superclass handle axe/shovel Fixes #3137 --- .../item/equipment/tool/ItemEnderDagger.java | 6 ++++ .../equipment/tool/bow/ItemLivingwoodBow.java | 6 ++++ .../tool/manasteel/ItemManasteelAxe.java | 25 +++++--------- .../tool/manasteel/ItemManasteelPick.java | 6 ++-- .../tool/manasteel/ItemManasteelShears.java | 6 ++++ .../tool/manasteel/ItemManasteelShovel.java | 33 +++++++++---------- .../tool/manasteel/ItemManasteelSword.java | 18 ++-------- 7 files changed, 47 insertions(+), 53 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java index 362e879fd..fcb512f29 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java @@ -26,6 +26,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; import javax.annotation.Nonnull; +import java.util.function.Consumer; public class ItemEnderDagger extends ItemManasteelSword { @@ -45,6 +46,11 @@ public class ItemEnderDagger extends ItemManasteelSword { return true; } + @Override + public int damageItem(ItemStack stack, int amount, T entity, Consumer onBroken) { + return amount; + } + @Override public void inventoryTick(ItemStack stack, World world, Entity player, int par4, boolean par5) {} diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java index 35ffadf2c..f5c5fbc71 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java @@ -34,6 +34,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import javax.annotation.Nonnull; +import java.util.function.Consumer; public class ItemLivingwoodBow extends BowItem implements IManaUsingItem { public static final int MANA_PER_DAMAGE = 40; @@ -166,4 +167,9 @@ public class ItemLivingwoodBow extends BowItem implements IManaUsingItem { public boolean usesMana(ItemStack stack) { return true; } + + @Override + public int damageItem(ItemStack stack, int amount, T entity, Consumer onBroken) { + return ToolCommons.damageItemIfPossible(stack, amount, entity, MANA_PER_DAMAGE); + } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java index 085bb5bd8..85f4bd15e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.item.equipment.tool.manasteel; -import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -19,7 +18,6 @@ import net.minecraft.item.IItemTier; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.util.ActionResultType; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.ISortableTool; @@ -30,6 +28,7 @@ import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.equipment.tool.ToolCommons; import javax.annotation.Nonnull; +import java.util.function.Consumer; import java.util.regex.Pattern; public class ItemManasteelAxe extends AxeItem implements IManaUsingItem, ISortableTool { @@ -47,17 +46,8 @@ public class ItemManasteelAxe extends AxeItem implements IManaUsingItem, ISortab } @Override - public boolean hitEntity(ItemStack par1ItemStack, LivingEntity par2EntityLivingBase, @Nonnull LivingEntity par3EntityLivingBase) { - ToolCommons.damageItem(par1ItemStack, 1, par3EntityLivingBase, getManaPerDamage()); - return true; - } - - @Override - public boolean onBlockDestroyed(@Nonnull ItemStack stack, @Nonnull World world, @Nonnull BlockState state, @Nonnull BlockPos pos, @Nonnull LivingEntity entity) { - if (state.getBlockHardness(world, pos) != 0F) - ToolCommons.damageItem(stack, 1, entity, getManaPerDamage()); - - return true; + public int damageItem(ItemStack stack, int amount, T entity, Consumer onBroken) { + return ToolCommons.damageItemIfPossible(stack, amount, entity, getManaPerDamage()); } public int getManaPerDamage() { @@ -73,14 +63,15 @@ public class ItemManasteelAxe extends AxeItem implements IManaUsingItem, ISortab ItemStack stackAt = player.inventory.getStackInSlot(i); if(!stackAt.isEmpty() && SAPLING_PATTERN.matcher(stackAt.getItem().getTranslationKey()).find()) { ItemStack displayStack = stackAt.copy(); - ActionResultType did = PlayerHelper.substituteUse(ctx, stackAt); - ItemsRemainingRenderHandler.set(player, displayStack, SAPLING_PATTERN); - return did; + if (PlayerHelper.substituteUse(ctx, stackAt) == ActionResultType.SUCCESS) { + ItemsRemainingRenderHandler.set(player, displayStack, SAPLING_PATTERN); + return ActionResultType.SUCCESS; + } } } } - return ActionResultType.PASS; + return super.onItemUse(ctx); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java index fa6c6d098..6f9739d2e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java @@ -30,6 +30,7 @@ import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.equipment.tool.ToolCommons; import javax.annotation.Nonnull; +import java.util.function.Consumer; import java.util.regex.Pattern; public class ItemManasteelPick extends PickaxeItem implements IManaUsingItem, ISortableTool { @@ -47,9 +48,8 @@ public class ItemManasteelPick extends PickaxeItem implements IManaUsingItem, IS } @Override - public boolean hitEntity(ItemStack par1ItemStack, LivingEntity par2EntityLivingBase, @Nonnull LivingEntity par3EntityLivingBase) { - ToolCommons.damageItem(par1ItemStack, 1, par3EntityLivingBase, getManaPerDamage()); - return true; + public int damageItem(ItemStack stack, int amount, T entity, Consumer onBroken) { + return ToolCommons.damageItemIfPossible(stack, amount, entity, getManaPerDamage()); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java index 03fafc8a7..f4a4c7ae4 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java @@ -33,6 +33,7 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import javax.annotation.Nonnull; import java.util.List; import java.util.Random; +import java.util.function.Consumer; public class ItemManasteelShears extends ShearsItem implements IManaUsingItem { @@ -98,6 +99,11 @@ public class ItemManasteelShears extends ShearsItem implements IManaUsingItem { return false; } + @Override + public int damageItem(ItemStack stack, int amount, T entity, Consumer onBroken) { + return ToolCommons.damageItemIfPossible(stack, amount, entity, MANA_PER_DAMAGE); + } + @Override public void inventoryTick(ItemStack stack, World world, Entity player, int par4, boolean par5) { if(!world.isRemote && player instanceof PlayerEntity && stack.getDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (PlayerEntity) player, MANA_PER_DAMAGE * 2, true)) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java index 1751e6132..e6e58164e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java @@ -38,6 +38,7 @@ import vazkii.botania.common.lib.LibObfuscation; import javax.annotation.Nonnull; import java.util.Map; +import java.util.function.Consumer; public class ItemManasteelShovel extends ShovelItem implements IManaUsingItem, ISortableTool { @@ -59,11 +60,8 @@ public class ItemManasteelShovel extends ShovelItem implements IManaUsingItem, I } @Override - public boolean onBlockDestroyed(@Nonnull ItemStack stack, @Nonnull World world, @Nonnull BlockState state, @Nonnull BlockPos pos, @Nonnull LivingEntity entity) { - if (state.getBlockHardness(world, pos) != 0F) - ToolCommons.damageItem(stack, 1, entity, getManaPerDamage()); - - return true; + public int damageItem(ItemStack stack, int amount, T entity, Consumer onBroken) { + return ToolCommons.damageItemIfPossible(stack, amount, entity, getManaPerDamage()); } public int getManaPerDamage() { @@ -73,6 +71,9 @@ public class ItemManasteelShovel extends ShovelItem implements IManaUsingItem, I @Nonnull @Override public ActionResultType onItemUse(ItemUseContext ctx) { + if (super.onItemUse(ctx) == ActionResultType.SUCCESS) + return ActionResultType.SUCCESS; + ItemStack stack = ctx.getItem(); PlayerEntity player = ctx.getPlayer(); World world = ctx.getWorld(); @@ -81,21 +82,17 @@ public class ItemManasteelShovel extends ShovelItem implements IManaUsingItem, I if (player == null || !player.canPlayerEdit(pos, ctx.getFace(), stack)) return ActionResultType.PASS; - Block block = world.getBlockState(pos).getBlock(); - BlockState converted = field_195955_e.get(block); + UseHoeEvent event = new UseHoeEvent(ctx); + if (MinecraftForge.EVENT_BUS.post(event)) + return ActionResultType.FAIL; - if (converted == null) { - UseHoeEvent event = new UseHoeEvent(ctx); - - if (MinecraftForge.EVENT_BUS.post(event)) - return ActionResultType.FAIL; - - if (event.getResult() == Event.Result.ALLOW) { - ToolCommons.damageItem(stack, 1, player, getManaPerDamage()); - return ActionResultType.SUCCESS; - } - converted = HOE_LOOKUP.get(block); + if (event.getResult() == Event.Result.ALLOW) { + ToolCommons.damageItem(stack, 1, player, getManaPerDamage()); + return ActionResultType.SUCCESS; } + + Block block = world.getBlockState(pos).getBlock(); + BlockState converted = HOE_LOOKUP.get(block); if (converted == null) return ActionResultType.PASS; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java index 572a11f4e..ed889d865 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.item.equipment.tool.manasteel; -import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -18,14 +17,13 @@ import net.minecraft.item.IItemTier; import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.item.equipment.tool.ToolCommons; -import javax.annotation.Nonnull; +import java.util.function.Consumer; public class ItemManasteelSword extends SwordItem implements IManaUsingItem { @@ -42,18 +40,8 @@ public class ItemManasteelSword extends SwordItem implements IManaUsingItem { } @Override - public boolean hitEntity(ItemStack par1ItemStack, LivingEntity par2EntityLivingBase, @Nonnull LivingEntity par3EntityLivingBase) { - if(usesMana(par1ItemStack)) - ToolCommons.damageItem(par1ItemStack, 1, par3EntityLivingBase, getManaPerDamage()); - return true; - } - - @Override - public boolean onBlockDestroyed(@Nonnull ItemStack stack, @Nonnull World world, BlockState state, @Nonnull BlockPos pos, @Nonnull LivingEntity entity) { - if(usesMana(stack) && state.getBlockHardness(world, pos) != 0F) - ToolCommons.damageItem(stack, 1, entity, getManaPerDamage()); - - return true; + public int damageItem(ItemStack stack, int amount, T entity, Consumer onBroken) { + return ToolCommons.damageItemIfPossible(stack, amount, entity, getManaPerDamage()); } @Override