From defa88bbff2b37a7785ff25d52aaceb01e1707c9 Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 8 Apr 2022 17:32:13 +0200 Subject: [PATCH] Changed Hammer Tool handling --- src/main/java/ru/betterend/item/tool/EndHammerItem.java | 8 ++------ src/main/resources/fabric.mod.json | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/ru/betterend/item/tool/EndHammerItem.java b/src/main/java/ru/betterend/item/tool/EndHammerItem.java index 35b0c599..2cd42bcf 100644 --- a/src/main/java/ru/betterend/item/tool/EndHammerItem.java +++ b/src/main/java/ru/betterend/item/tool/EndHammerItem.java @@ -9,8 +9,6 @@ import net.fabricmc.api.Environment; import net.minecraft.client.renderer.block.model.BlockModel; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.BlockTags; -import net.minecraft.tags.Tag; import net.minecraft.util.Mth; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; @@ -27,8 +25,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Material; -import ru.bclib.api.tag.CommonItemTags; -import ru.bclib.api.tag.NamedCommonItemTags; +import ru.bclib.api.tag.*; import ru.bclib.api.tag.TagAPI.TagLocation; import ru.bclib.client.models.ModelsHelper; import ru.bclib.interfaces.ItemModelProvider; @@ -43,8 +40,7 @@ public class EndHammerItem extends DiggerItem implements ItemModelProvider, TagP private final Multimap attributeModifiers; public EndHammerItem(Tier material, float attackDamage, float attackSpeed, double knockback, Properties settings) { - //we override all methods that access BlockTags.MINEABLE_WITH_PICKAXE in the superclass, so this should not matter - super(attackDamage, attackSpeed, material, BlockTags.MINEABLE_WITH_PICKAXE, settings); + super(attackDamage, attackSpeed, material, CommonBlockTags.MINABLE_WITH_HAMMER, settings); Builder builder = ImmutableMultimap.builder(); builder.put( diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index a48d3e5c..04fd3e8f 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -46,7 +46,7 @@ "fabricloader": ">=0.13.3", "fabric": ">=0.44.0", "minecraft": "1.18.2", - "bclib": ">=1.4.1" + "bclib": ">=1.4.2" }, "suggests": { "byg": ">=1.1.3",