Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow sneak-wrenching any block in the mod to break it.

Browse Source 
Move playSound for block break/place/etc to util method.
This commit is contained in:
Florian Nücke
2020-12-27 16:36:03 +01:00
parent c6d95fc55f
commit 35b67744cd
4 changed files with 47 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/li/cil/oc2/common/block/ComputerBlock.java
View File

@@ -25,7 +25,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ActionResultType;
import net.minecraft.util.Direction;
import net.minecraft.util.Hand;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.text.ITextComponent;
@@ -86,14 +85,8 @@ public final class ComputerBlock extends HorizontalBlock {
final ComputerTileEntity computer = (ComputerTileEntity) tileEntity;
final ItemStack heldItem = player.getHeldItem(hand);
if (Wrenches.isWrench(heldItem)) {
if (!world.isRemote() && player instanceof ServerPlayerEntity) {
final ServerPlayerEntity serverPlayer = (ServerPlayerEntity) player;
if (player.isSneaking()) {
serverPlayer.interactionManager.tryHarvestBlock(pos);
world.playSound(null, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, soundType.getBreakSound(), SoundCategory.BLOCKS, (soundType.getVolume() + 1f) / 2f, soundType.getPitch() * 0.8f);
} else {
openContainerScreen(computer, serverPlayer);
}
if (player instanceof ServerPlayerEntity) {
openContainerScreen(computer, (ServerPlayerEntity) player);
}
} else {
if (player.isSneaking()) {