Fix inconsistencies with movement and position

bootstrap/spigot/pom.xml

@@ -29,6 +29,11 @@
             <version>3.2.0</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.geysermc.adapters</groupId>
+            <artifactId>spigot-all</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
     <build>
         <finalName>${outputName}-Spigot</finalName>

bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/GeyserSpigotPlugin.java

@@ -25,8 +25,10 @@
 
 package org.geysermc.platform.spigot;
 
+import com.github.steveice10.mc.protocol.MinecraftConstants;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.geysermc.adapters.spigot.SpigotAdapters;
 import org.geysermc.common.PlatformType;
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.bootstrap.GeyserBootstrap;
@@ -42,18 +44,23 @@
 import org.geysermc.platform.spigot.command.GeyserSpigotCommandManager;
 import org.geysermc.platform.spigot.command.SpigotCommandSender;
 import org.geysermc.platform.spigot.world.GeyserSpigotBlockPlaceListener;
-import org.geysermc.platform.spigot.world.GeyserSpigotWorldManager;
+import org.geysermc.platform.spigot.world.manager.*;
+import us.myles.ViaVersion.api.Pair;
 import us.myles.ViaVersion.api.Via;
+import us.myles.ViaVersion.api.data.MappingData;
+import us.myles.ViaVersion.api.protocol.Protocol;
+import us.myles.ViaVersion.api.protocol.ProtocolRegistry;
+import us.myles.ViaVersion.api.protocol.ProtocolVersion;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.List;
 import java.util.UUID;
 import java.util.logging.Level;
 
 public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap {
-
     private GeyserSpigotCommandManager geyserCommandManager;
     private GeyserSpigotConfiguration geyserConfig;
     private GeyserSpigotLogger geyserLogger;
@@ -142,8 +149,48 @@ public void onEnable() {
         // Set if we need to use a different method for getting a player's locale
         SpigotCommandSender.setUseLegacyLocaleMethod(!isCompatible(Bukkit.getServer().getVersion(), "1.12.0"));
 
-        this.geyserWorldManager = new GeyserSpigotWorldManager(isLegacy, use3dBiomes, isViaVersion);
-        GeyserSpigotBlockPlaceListener blockPlaceListener = new GeyserSpigotBlockPlaceListener(connector, isLegacy, isViaVersion);
+        if (connector.getConfig().isUseAdapters()) {
+            try {
+                String name = Bukkit.getServer().getClass().getPackage().getName();
+                String nmsVersion = name.substring(name.lastIndexOf('.') + 1);
+                SpigotAdapters.registerWorldAdapter(nmsVersion);
+                if (isViaVersion && isViaVersionNeeded()) {
+                    if (isLegacy) {
+                        // Pre-1.13
+                        this.geyserWorldManager = new GeyserSpigot1_12NativeWorldManager();
+                    } else {
+                        // Post-1.13
+                        this.geyserWorldManager = new GeyserSpigotLegacyNativeWorldManager(this, use3dBiomes);
+                    }
+                } else {
+                    // No ViaVersion
+                    this.geyserWorldManager = new GeyserSpigotNativeWorldManager(use3dBiomes);
+                }
+                geyserLogger.debug("Using NMS adapter: " + this.geyserWorldManager.getClass() + ", " + nmsVersion);
+            } catch (Exception e) {
+                if (geyserConfig.isDebugMode()) {
+                    geyserLogger.debug("Error while attempting to find NMS adapter. Most likely, this can be safely ignored. :)");
+                    e.printStackTrace();
+                }
+            }
+        } else {
+            geyserLogger.debug("Not using NMS adapter as it is disabled in the config.");
+        }
+        if (this.geyserWorldManager == null) {
+            // No NMS adapter
+            if (isLegacy && isViaVersion) {
+                // Use ViaVersion for converting pre-1.13 block states
+                this.geyserWorldManager = new GeyserSpigot1_12WorldManager();
+            } else if (isLegacy) {
+                // Not sure how this happens - without ViaVersion, we don't know any block states, so just assume everything is air
+                this.geyserWorldManager = new GeyserSpigotFallbackWorldManager();
+            } else {
+                // Post-1.13
+                this.geyserWorldManager = new GeyserSpigotWorldManager(use3dBiomes);
+            }
+            geyserLogger.debug("Using default world manager: " + this.geyserWorldManager.getClass());
+        }
+        GeyserSpigotBlockPlaceListener blockPlaceListener = new GeyserSpigotBlockPlaceListener(connector, this.geyserWorldManager);
 
         Bukkit.getServer().getPluginManager().registerEvents(blockPlaceListener, this);
 
@@ -152,8 +199,9 @@ public void onEnable() {
 
     @Override
     public void onDisable() {
-        if (connector != null)
+        if (connector != null) {
             connector.shutdown();
+        }
     }
 
     @Override
@@ -186,6 +234,11 @@ public Path getConfigFolder() {
         return getDataFolder().toPath();
     }
 
+    @Override
+    public BootstrapDumpInfo getDumpInfo() {
+        return new GeyserSpigotDumpInfo();
+    }
+
     public boolean isCompatible(String version, String whichVersion) {
         int[] currentVersion = parseVersion(version);
         int[] otherVersion = parseVersion(whichVersion);
@@ -213,15 +266,43 @@ private int[] parseVersion(String versionParam) {
             String t = stringArray[index].replaceAll("\\D", "");
             try {
                 temp[index] = Integer.parseInt(t);
-            } catch(NumberFormatException ex) {
+            } catch (NumberFormatException ex) {
                 temp[index] = 0;
             }
         }
         return temp;
     }
 
-    @Override
-    public BootstrapDumpInfo getDumpInfo() {
-        return new GeyserSpigotDumpInfo();
+    /**
+     * @return the server version before ViaVersion finishes initializing
+     */
+    public ProtocolVersion getServerProtocolVersion() {
+        String bukkitVersion = Bukkit.getServer().getVersion();
+        // Turn "(MC: 1.16.4)" into 1.16.4.
+        String version = bukkitVersion.split("\\(MC: ")[1].split("\\)")[0];
+        return ProtocolVersion.getClosest(version);
+    }
+
+    /**
+     * This function should not run unless ViaVersion is installed on the server.
+     *
+     * @return true if there is any block mappings difference between the server and client.
+     */
+    private boolean isViaVersionNeeded() {
+        ProtocolVersion serverVersion = getServerProtocolVersion();
+        List<Pair<Integer, Protocol>> protocolList = ProtocolRegistry.getProtocolPath(MinecraftConstants.PROTOCOL_VERSION,
+                serverVersion.getVersion());
+        if (protocolList == null) {
+            // No translation needed!
+            return false;
+        }
+        for (int i = protocolList.size() - 1; i >= 0; i--) {
+            MappingData mappingData = protocolList.get(i).getValue().getMappingData();
+            if (mappingData != null) {
+                return true;
+            }
+        }
+        // All mapping data is null, which means client and server block states are the same
+        return false;
     }
 }

bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/world/GeyserSpigotBlockPlaceListener.java

@@ -36,13 +36,13 @@
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.world.block.BlockTranslator;
+import org.geysermc.platform.spigot.world.manager.GeyserSpigotWorldManager;
 
 @AllArgsConstructor
 public class GeyserSpigotBlockPlaceListener implements Listener {
 
     private final GeyserConnector connector;
-    private final boolean isLegacy;
-    private final boolean isViaVersion;
+    private final GeyserSpigotWorldManager worldManager;
 
     @EventHandler
     public void place(final BlockPlaceEvent event) {
@@ -52,14 +52,13 @@ public void place(final BlockPlaceEvent event) {
                 placeBlockSoundPacket.setSound(SoundEvent.PLACE);
                 placeBlockSoundPacket.setPosition(Vector3f.from(event.getBlockPlaced().getX(), event.getBlockPlaced().getY(), event.getBlockPlaced().getZ()));
                 placeBlockSoundPacket.setBabySound(false);
-                String javaBlockId;
-                if (isLegacy) {
-                    javaBlockId = BlockTranslator.getJavaIdBlockMap().inverse().get(GeyserSpigotWorldManager.getLegacyBlock(session,
-                            event.getBlockPlaced().getX(), event.getBlockPlaced().getY(), event.getBlockPlaced().getZ(), isViaVersion));
+                if (worldManager.isLegacy()) {
+                    placeBlockSoundPacket.setExtraData(BlockTranslator.getBedrockBlockId(worldManager.getBlockAt(session,
+                            event.getBlockPlaced().getX(), event.getBlockPlaced().getY(), event.getBlockPlaced().getZ())));
                 } else {
-                    javaBlockId = event.getBlockPlaced().getBlockData().getAsString();
+                    String javaBlockId = event.getBlockPlaced().getBlockData().getAsString();
+                    placeBlockSoundPacket.setExtraData(BlockTranslator.getBedrockBlockId(BlockTranslator.getJavaIdBlockMap().getOrDefault(javaBlockId, BlockTranslator.JAVA_AIR_ID)));
                 }
-                placeBlockSoundPacket.setExtraData(BlockTranslator.getBedrockBlockId(BlockTranslator.getJavaIdBlockMap().getOrDefault(javaBlockId, 0)));
                 placeBlockSoundPacket.setIdentifier(":");
                 session.sendUpstreamPacket(placeBlockSoundPacket);
                 session.setLastBlockPlacePosition(null);

bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/world/manager/GeyserSpigot1_12NativeWorldManager.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.platform.spigot.world.manager;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.geysermc.adapters.spigot.SpigotAdapters;
+import org.geysermc.adapters.spigot.SpigotWorldAdapter;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.world.block.BlockTranslator;
+import us.myles.ViaVersion.api.Via;
+import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.storage.BlockStorage;
+
+/**
+ * Used with ViaVersion and pre-1.13.
+ */
+public class GeyserSpigot1_12NativeWorldManager extends GeyserSpigot1_12WorldManager {
+    private final SpigotWorldAdapter adapter;
+
+    public GeyserSpigot1_12NativeWorldManager() {
+        this.adapter = SpigotAdapters.getWorldAdapter();
+        // Unlike post-1.13, we can't build up a cache of block states, because block entities need some special conversion
+    }
+
+    @Override
+    public int getBlockAt(GeyserSession session, int x, int y, int z) {
+        Player player = Bukkit.getPlayer(session.getPlayerEntity().getUsername());
+        if (player == null) {
+            return BlockTranslator.JAVA_AIR_ID;
+        }
+        // Get block entity storage
+        BlockStorage storage = Via.getManager().getConnection(player.getUniqueId()).get(BlockStorage.class);
+        int blockId = adapter.getBlockAt(player.getWorld(), x, y, z);
+        return getLegacyBlock(storage, blockId, x, y, z);
+    }
+}