Use ViaVersion for block placing sounds (#551)

GeyserBukkitBlockPlaceListener previous assumed that getBlockData() was available. This separates the ViaVersion code from getBlockAt to make it accessible elsewhere.

bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitPlugin.java

@@ -94,7 +94,7 @@ public class GeyserBukkitPlugin extends JavaPlugin implements GeyserBootstrap {
         }
 
         this.geyserWorldManager = new GeyserBukkitWorldManager(isLegacy, isViaVersion);
-        this.blockPlaceListener = new GeyserBukkitBlockPlaceListener(connector);
+        this.blockPlaceListener = new GeyserBukkitBlockPlaceListener(connector, isLegacy, isViaVersion);
         Bukkit.getServer().getPluginManager().registerEvents(blockPlaceListener, this);
 
         this.getCommand("geyser").setExecutor(new GeyserBukkitCommandExecutor(connector));

bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/world/GeyserBukkitBlockPlaceListener.java

@@ -42,6 +42,8 @@ import org.geysermc.connector.network.translators.world.block.BlockTranslator;
 public class GeyserBukkitBlockPlaceListener implements Listener {
 
     private final GeyserConnector connector;
+    private final boolean isLegacy;
+    private final boolean isViaVersion;
 
     @EventHandler
     public void place(final BlockPlaceEvent event) {
@@ -51,7 +53,14 @@ public class GeyserBukkitBlockPlaceListener implements Listener {
                 placeBlockSoundPacket.setSound(SoundEvent.PLACE);
                 placeBlockSoundPacket.setPosition(Vector3f.from(event.getBlockPlaced().getX(), event.getBlockPlaced().getY(), event.getBlockPlaced().getZ()));
                 placeBlockSoundPacket.setBabySound(false);
-                placeBlockSoundPacket.setExtraData(BlockTranslator.getBedrockBlockId(BlockTranslator.getJavaIdBlockMap().get(event.getBlockPlaced().getBlockData().getAsString())));
+                String javaBlockId;
+                if (isLegacy) {
+                    javaBlockId = BlockTranslator.getJavaIdBlockMap().inverse().get(GeyserBukkitWorldManager.getLegacyBlock(session,
+                            event.getBlockPlaced().getX(), event.getBlockPlaced().getY(), event.getBlockPlaced().getZ(), isViaVersion));
+                } else {
+                    javaBlockId = event.getBlockPlaced().getBlockData().getAsString();
+                }
+                placeBlockSoundPacket.setExtraData(BlockTranslator.getBedrockBlockId(BlockTranslator.getJavaIdBlockMap().get(javaBlockId)));
                 placeBlockSoundPacket.setIdentifier(":");
                 session.sendUpstreamPacket(placeBlockSoundPacket);
                 session.setLastBlockPlacePosition(null);

bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/world/GeyserBukkitWorldManager.java

@@ -29,11 +29,13 @@ package org.geysermc.platform.bukkit.world;
 import com.github.steveice10.mc.protocol.data.game.world.block.BlockState;
 
 import lombok.AllArgsConstructor;
+import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.block.Block;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.world.WorldManager;
 import org.geysermc.connector.network.translators.world.block.BlockTranslator;
+import org.geysermc.platform.bukkit.GeyserBukkitPlugin;
 import us.myles.ViaVersion.protocols.protocol1_13_1to1_13.Protocol1_13_1To1_13;
 import us.myles.ViaVersion.protocols.protocol1_15to1_14_4.data.MappingData;
 
@@ -46,25 +48,29 @@ public class GeyserBukkitWorldManager extends WorldManager {
     private final boolean isViaVersion;
 
     @Override
-    @SuppressWarnings("deprecation")
     public BlockState getBlockAt(GeyserSession session, int x, int y, int z) {
         if (session.getPlayerEntity() == null) {
             return BlockTranslator.AIR;
         }
         if (isLegacy) {
-            if (isViaVersion) {
+            return getLegacyBlock(session, x, y, z, isViaVersion);
-                Block block = Bukkit.getPlayer(session.getPlayerEntity().getUsername()).getWorld().getBlockAt(x, y, z);
-                // Black magic that gets the old block state ID
-                int oldBlockId = (block.getType().getId() << 4) | (block.getData() & 0xF);
-                // Convert block state from old version -> 1.13 -> 1.13.1 -> 1.14 -> 1.15
-                int thirteenBlockId = us.myles.ViaVersion.protocols.protocol1_13to1_12_2.data.MappingData.blockMappings.getNewId(oldBlockId);
-                int thirteenPointOneBlockId = Protocol1_13_1To1_13.getNewBlockStateId(thirteenBlockId);
-                int fourteenBlockId = us.myles.ViaVersion.protocols.protocol1_14to1_13_2.data.MappingData.blockStateMappings.getNewId(thirteenPointOneBlockId);
-                return new BlockState(MappingData.blockStateMappings.getNewId(fourteenBlockId));
-            } else {
-                return BlockTranslator.AIR;
-            }
         }
         return BlockTranslator.getJavaIdBlockMap().get(Bukkit.getPlayer(session.getPlayerEntity().getUsername()).getWorld().getBlockAt(x, y, z).getBlockData().getAsString());
     }
+
+    @SuppressWarnings("deprecation")
+    public static BlockState getLegacyBlock(GeyserSession session, int x, int y, int z, boolean isViaVersion) {
+        if (isViaVersion) {
+            Block block = Bukkit.getPlayer(session.getPlayerEntity().getUsername()).getWorld().getBlockAt(x, y, z);
+            // Black magic that gets the old block state ID
+            int oldBlockId = (block.getType().getId() << 4) | (block.getData() & 0xF);
+            // Convert block state from old version -> 1.13 -> 1.13.1 -> 1.14 -> 1.15
+            int thirteenBlockId = us.myles.ViaVersion.protocols.protocol1_13to1_12_2.data.MappingData.blockMappings.getNewId(oldBlockId);
+            int thirteenPointOneBlockId = Protocol1_13_1To1_13.getNewBlockStateId(thirteenBlockId);
+            int fourteenBlockId = us.myles.ViaVersion.protocols.protocol1_14to1_13_2.data.MappingData.blockStateMappings.getNewId(thirteenPointOneBlockId);
+            return new BlockState(MappingData.blockStateMappings.getNewId(fourteenBlockId));
+        } else {
+            return BlockTranslator.AIR;
+        }
+    }
 }