FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2024-11-27 01:55:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix items with sword tool tag not instantly breaking bamboo (#1110)

Browse source 
* Fix items with sword tool tag not instantly breaking bamboo

* Consolidate mixins

* Add Javadoc to injection
This commit is contained in:
Virtuoel 2020-11-07 22:56:13 +03:00 committed by modmuss50
parent 8d074a03a9
commit b617f4f7e4
2 changed files with 47 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
fabric-tool-attribute-api-v1/src/main/java/net/fabricmc/fabric/mixin/tool/attribute/BambooBlockMixin.java Normal file
View file

@ -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.
*
* <p>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<Float> info) {
if (FabricToolTags.SWORDS.contains(player.getMainHandStack().getItem())) {
info.setReturnValue(1.0F);
}
}
}

1
fabric-tool-attribute-api-v1/src/main/resources/fabric-tool-attribute-api-v1.mixins.json
View file

@ -3,6 +3,7 @@
"package": "net.fabricmc.fabric.mixin.tool.attribute", "package": "net.fabricmc.fabric.mixin.tool.attribute",
"compatibilityLevel": "JAVA_8", "compatibilityLevel": "JAVA_8",
"mixins": [ "mixins": [
"BambooBlockMixin",
"MixinItemStack", "MixinItemStack",
"MixinLivingEntity" "MixinLivingEntity"
], ],