Sails use vanilla dye/shear sounds

Adds the "Dye stains" and "Shears click" sounds to the sail block when the respective action occurs.
This commit is contained in:
starlottemusic 2022-11-14 17:29:47 -05:00 committed by GitHub
parent cf87508276
commit bbe0c2a5cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -21,6 +21,8 @@ import net.minecraft.MethodsReturnNonnullByDefault;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.core.NonNullList; import net.minecraft.core.NonNullList;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.sounds.SoundSource;
import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult; import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
@ -90,6 +92,7 @@ public class SailBlock extends WrenchableDirectionalBlock {
if (heldItem.getItem() instanceof ShearsItem) { if (heldItem.getItem() instanceof ShearsItem) {
if (!world.isClientSide) if (!world.isClientSide)
world.playSound(null, pos, SoundEvents.SHEEP_SHEAR, SoundSource.BLOCKS, 1.0f, 1.0f);
applyDye(state, world, pos, ray.getLocation(), null); applyDye(state, world, pos, ray.getLocation(), null);
return InteractionResult.SUCCESS; return InteractionResult.SUCCESS;
} }
@ -100,6 +103,7 @@ public class SailBlock extends WrenchableDirectionalBlock {
DyeColor color = DyeColor.getColor(heldItem); DyeColor color = DyeColor.getColor(heldItem);
if (color != null) { if (color != null) {
if (!world.isClientSide) if (!world.isClientSide)
world.playSound(null, pos, SoundEvents.DYE_USE, SoundSource.BLOCKS, 1.0f, 1.1f - world.random.nextFloat() * .2f);
applyDye(state, world, pos, ray.getLocation(), color); applyDye(state, world, pos, ray.getLocation(), color);
return InteractionResult.SUCCESS; return InteractionResult.SUCCESS;
} }