diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/InternalBridge.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/InternalBridge.java index 54c6f58..639ff90 100644 --- a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/InternalBridge.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/InternalBridge.java @@ -1,6 +1,5 @@ package net.nuggetmc.tplus.api; -import org.bukkit.Sound; import org.bukkit.block.Block; /** @@ -8,6 +7,4 @@ import org.bukkit.block.Block; */ public interface InternalBridge { void sendBlockDestructionPacket(short entityId, Block block, int progress); - - Sound breakBlockSound(Block block); } diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyUtils.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyUtils.java index d7c00b7..bddb858 100644 --- a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyUtils.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyUtils.java @@ -1,6 +1,5 @@ package net.nuggetmc.tplus.api.agent.legacyagent; -import net.nuggetmc.tplus.api.TerminatorPlusAPI; import org.bukkit.Location; import org.bukkit.Sound; import org.bukkit.block.Block; @@ -32,6 +31,6 @@ public class LegacyUtils { } public static Sound breakBlockSound(Block block) { - return TerminatorPlusAPI.getInternalBridge().breakBlockSound(block); + return block.getBlockData().getSoundGroup().getBreakSound(); } } diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bridge/InternalBridgeImpl.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bridge/InternalBridgeImpl.java index 5d03de0..133a781 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bridge/InternalBridgeImpl.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bridge/InternalBridgeImpl.java @@ -2,13 +2,8 @@ package net.nuggetmc.tplus.bridge; import net.minecraft.core.BlockPos; import net.minecraft.network.protocol.game.ClientboundBlockDestructionPacket; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.block.state.BlockState; import net.nuggetmc.tplus.api.InternalBridge; -import org.bukkit.Sound; import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; @@ -20,19 +15,4 @@ public class InternalBridgeImpl implements InternalBridge { ((CraftPlayer) all).getHandle().connection.send(crack); } } - - @Override - public Sound breakBlockSound(Block block) { - try { - Level nmsWorld = ((CraftWorld) block.getWorld()).getHandle(); - BlockState blockState = nmsWorld.getBlockState(new BlockPos(block.getX(), block.getY(), block.getZ())); - net.minecraft.world.level.block.Block nmsBlock = blockState.getBlock(); - - SoundType soundEffectType = nmsBlock.getSoundType(blockState); - - return Sound.valueOf(soundEffectType.getBreakSound().getLocation().getPath().replace(".", "_").toUpperCase()); - } catch (Exception e) { // potentially unsafe, just fallback to stone break sound - return Sound.BLOCK_STONE_BREAK; - } - } }