From dc0d28e2c4800fe8c2f9f1a05a836dcb1a1c588d Mon Sep 17 00:00:00 2001 From: GirafiStudios Date: Thu, 27 Aug 2020 00:57:31 +0200 Subject: [PATCH] Cherry Picked "Fixed Neptunium Fillet Knife taking damage in some instances" --- .../aquaculture/item/ItemFilletKnife.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/teammetallurgy/aquaculture/item/ItemFilletKnife.java b/src/main/java/com/teammetallurgy/aquaculture/item/ItemFilletKnife.java index c278d806..33bbe221 100644 --- a/src/main/java/com/teammetallurgy/aquaculture/item/ItemFilletKnife.java +++ b/src/main/java/com/teammetallurgy/aquaculture/item/ItemFilletKnife.java @@ -1,9 +1,9 @@ package com.teammetallurgy.aquaculture.item; -import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import com.teammetallurgy.aquaculture.Aquaculture; import com.teammetallurgy.aquaculture.api.AquacultureAPI; +import net.minecraft.block.BlockState; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.Enchantments; @@ -14,8 +14,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.Style; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; @@ -59,6 +59,16 @@ public Multimap getAttributeModifiers(@Nonnull Equipm return map; } + @Override + public boolean hitEntity(@Nonnull ItemStack stack, @Nonnull LivingEntity target, @Nonnull LivingEntity attacker) { + return this.getTier() == AquacultureAPI.MATS.NEPTUNIUM || super.hitEntity(stack, target, attacker); + } + + @Override + public boolean onBlockDestroyed(@Nonnull ItemStack stack, @Nonnull World world, @Nonnull BlockState state, @Nonnull BlockPos pos, @Nonnull LivingEntity entityLiving) { + return getTier() == AquacultureAPI.MATS.NEPTUNIUM || super.onBlockDestroyed(stack, world, state, pos, entityLiving); + } + @Override @OnlyIn(Dist.CLIENT) public void addInformation(@Nonnull ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag tooltipFlag) {