From b617f4f7e475162a62259049708579acf69244ca Mon Sep 17 00:00:00 2001 From: Virtuoel Date: Sat, 7 Nov 2020 22:56:13 +0300 Subject: [PATCH] Fix items with sword tool tag not instantly breaking bamboo (#1110) * Fix items with sword tool tag not instantly breaking bamboo * Consolidate mixins * Add Javadoc to injection --- .../tool/attribute/BambooBlockMixin.java | 46 +++++++++++++++++++ .../fabric-tool-attribute-api-v1.mixins.json | 1 + 2 files changed, 47 insertions(+) create mode 100644 fabric-tool-attribute-api-v1/src/main/java/net/fabricmc/fabric/mixin/tool/attribute/BambooBlockMixin.java diff --git a/fabric-tool-attribute-api-v1/src/main/java/net/fabricmc/fabric/mixin/tool/attribute/BambooBlockMixin.java b/fabric-tool-attribute-api-v1/src/main/java/net/fabricmc/fabric/mixin/tool/attribute/BambooBlockMixin.java new file mode 100644 index 000000000..b7a9508b8 --- /dev/null +++ b/fabric-tool-attribute-api-v1/src/main/java/net/fabricmc/fabric/mixin/tool/attribute/BambooBlockMixin.java @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.fabric.mixin.tool.attribute; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import net.minecraft.block.BambooBlock; +import net.minecraft.block.BambooSaplingBlock; +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.BlockView; + +import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; + +@Mixin({BambooBlock.class, BambooSaplingBlock.class}) +public abstract class BambooBlockMixin { + /** + * When the player is holding a {@link net.minecraft.item.SwordItem SwordItem}, Bamboo returns {@code 1.0F} and is instantly mined. + * + *

This injection provides that same functionality when mining with items that are in the {@link net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags#SWORDS fabric:swords} tag. + */ + @Inject(at = @At("HEAD"), method = "calcBlockBreakingDelta", cancellable = true) + private void onCalcBlockBreakingDelta(BlockState state, PlayerEntity player, BlockView world, BlockPos pos, CallbackInfoReturnable info) { + if (FabricToolTags.SWORDS.contains(player.getMainHandStack().getItem())) { + info.setReturnValue(1.0F); + } + } +} diff --git a/fabric-tool-attribute-api-v1/src/main/resources/fabric-tool-attribute-api-v1.mixins.json b/fabric-tool-attribute-api-v1/src/main/resources/fabric-tool-attribute-api-v1.mixins.json index 70792f2f3..7ae74cbd6 100644 --- a/fabric-tool-attribute-api-v1/src/main/resources/fabric-tool-attribute-api-v1.mixins.json +++ b/fabric-tool-attribute-api-v1/src/main/resources/fabric-tool-attribute-api-v1.mixins.json @@ -3,6 +3,7 @@ "package": "net.fabricmc.fabric.mixin.tool.attribute", "compatibilityLevel": "JAVA_8", "mixins": [ + "BambooBlockMixin", "MixinItemStack", "MixinLivingEntity" ],