Add support for server-controlled boat/horse riding on 1.21.130+ (#6033)

* Initial work, fixed boat on 1.21.130.

* Implement client-sided horse movement.

* Don't allow jumping in water.

* Fixed horse riding for older version, don't send movement in auth for boat.

* Removed some code.

* Oops, fixed jumping xD.

* Fixed boat paddling animation.

* Some boat fixes

Fix buoyancy
Handle relative move packets in Entity now; fixes vanilla movement
Slightly expand vehicle block cache to account for floating point error; fixes cache misses

* Address review.

---------

Co-authored-by: AJ Ferguson <AJ-Ferguson@users.noreply.github.com>

Author: oryxel1

core/src/main/java/org/geysermc/geyser/entity/type/BoatEntity.java

@@ -26,12 +26,16 @@
 package org.geysermc.geyser.entity.type;
 
 import lombok.Getter;
+import org.cloudburstmc.math.vector.Vector2f;
 import org.cloudburstmc.math.vector.Vector3f;
 import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataTypes;
 import org.cloudburstmc.protocol.bedrock.data.entity.EntityFlag;
 import org.cloudburstmc.protocol.bedrock.packet.MoveEntityAbsolutePacket;
 import org.geysermc.geyser.entity.EntityDefinition;
 import org.geysermc.geyser.entity.EntityDefinitions;
+import org.geysermc.geyser.entity.vehicle.BoatVehicleComponent;
+import org.geysermc.geyser.entity.vehicle.ClientVehicle;
+import org.geysermc.geyser.entity.vehicle.VehicleComponent;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.util.InteractionResult;
 import org.geysermc.geyser.util.InteractiveTag;
@@ -41,7 +45,7 @@
 
 import java.util.UUID;
 
-public class BoatEntity extends Entity implements Leashable, Tickable {
+public class BoatEntity extends Entity implements Tickable, Leashable, ClientVehicle {
 
     /**
      * Required when IS_BUOYANT is sent in order for boats to work in the water. <br>
@@ -53,6 +57,8 @@ public class BoatEntity extends Entity implements Leashable, Tickable {
             "\"big_wave_speed\":10.0,\"drag_down_on_buoyancy_removed\":0.0,\"liquid_blocks\":[\"minecraft:water\"," +
             "\"minecraft:flowing_water\"],\"simulate_waves\":false}";
 
+    private final BoatVehicleComponent vehicleComponent = new BoatVehicleComponent(this, 0);
+
     private boolean isPaddlingLeft;
     private float paddleTimeLeft;
     private boolean isPaddlingRight;
@@ -67,8 +73,8 @@ public class BoatEntity extends Entity implements Leashable, Tickable {
 
     private long leashHolderBedrockId = -1;
 
-    // Looks too fast and too choppy with 0.1f, which is how I believe the Microsoftian client handles it
-    private final float ROWING_SPEED = 0.1f;
+    // This is the best value, I can't really found any value that doesn't look choppy and laggy or that is not too slow, blame bedrock.
+    private final float ROWING_SPEED = 0.04f;
 
     public BoatEntity(GeyserSession session, int entityId, long geyserId, UUID uuid, EntityDefinition<?> definition, Vector3f position, Vector3f motion, float yaw, BoatVariant variant) {
         // Initial rotation is incorrect
@@ -192,8 +198,13 @@ public void tick() {
             // For packet timing accuracy, we'll send the packets here, as that's what Java Edition 1.21.3 does.
             ServerboundPaddleBoatPacket steerPacket = new ServerboundPaddleBoatPacket(session.isSteeringLeft(), session.isSteeringRight());
             session.sendDownstreamGamePacket(steerPacket);
-            return;
+
+            // If the vehicle is not controlled by the client, then we will have to send the client the rowing time else the animation won't play!
+            if (session.isInClientPredictedVehicle()) {
+                return;
+            }
         }
+
         doTick = !doTick; // Run every other tick
         if (!doTick || passengers.isEmpty()) {
             return;
@@ -212,11 +223,35 @@ public void tick() {
             paddleTimeRight += ROWING_SPEED;
             dirtyMetadata.put(EntityDataTypes.ROW_TIME_RIGHT, paddleTimeRight);
         }
+
+        if (isPaddlingLeft || isPaddlingRight) {
+            updateBedrockMetadata();
+        }
     }
 
     @Override
     public long leashHolderBedrockId() {
-        return leashHolderBedrockId;
+        return this.leashHolderBedrockId;
+    }
+
+    @Override
+    public VehicleComponent<?> getVehicleComponent() {
+        return this.vehicleComponent;
+    }
+
+    @Override
+    public Vector3f getRiddenInput(Vector2f input) {
+        return Vector3f.ZERO;
+    }
+
+    @Override
+    public float getVehicleSpeed() {
+        return 0;
+    }
+
+    @Override
+    public boolean isClientControlled() {
+        return !session.isInClientPredictedVehicle() && !passengers.isEmpty() && this.session.getPlayerEntity() == passengers.get(0);
     }
 
     /**

core/src/main/java/org/geysermc/geyser/entity/type/Entity.java

@@ -53,6 +53,7 @@
 import org.geysermc.geyser.entity.properties.type.PropertyType;
 import org.geysermc.geyser.entity.type.living.MobEntity;
 import org.geysermc.geyser.entity.type.player.PlayerEntity;
+import org.geysermc.geyser.entity.vehicle.ClientVehicle;
 import org.geysermc.geyser.item.Items;
 import org.geysermc.geyser.item.type.Item;
 import org.geysermc.geyser.level.physics.BoundingBox;
@@ -258,6 +259,13 @@ public void moveRelative(double relX, double relY, double relZ, float yaw, float
     }
 
     public void moveRelative(double relX, double relY, double relZ, float yaw, float pitch, float headYaw, boolean isOnGround) {
+        if (this instanceof ClientVehicle clientVehicle) {
+            if (clientVehicle.isClientControlled()) {
+                return;
+            }
+            clientVehicle.getVehicleComponent().moveRelative(relX, relY, relZ);
+        }
+
         position = Vector3f.from(position.getX() + relX, position.getY() + relY, position.getZ() + relZ);
 
         MoveEntityDeltaPacket moveEntityPacket = new MoveEntityDeltaPacket();

core/src/main/java/org/geysermc/geyser/entity/type/LivingEntity.java

@@ -356,18 +356,6 @@ public InteractionResult interact(Hand hand) {
         return super.interact(hand);
     }
 
-    @Override
-    public void moveRelative(double relX, double relY, double relZ, float yaw, float pitch, float headYaw, boolean isOnGround) {
-        if (this instanceof ClientVehicle clientVehicle) {
-            if (clientVehicle.isClientControlled()) {
-                return;
-            }
-            clientVehicle.getVehicleComponent().moveRelative(relX, relY, relZ);
-        }
-
-        super.moveRelative(relX, relY, relZ, yaw, pitch, headYaw, isOnGround);
-    }
-
     @Override
     public boolean setBoundingBoxHeight(float height) {
         if (valid && this instanceof ClientVehicle clientVehicle) {

core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/AbstractHorseEntity.java

@@ -27,7 +27,9 @@
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.cloudburstmc.math.vector.Vector2f;
 import org.cloudburstmc.math.vector.Vector3f;
+import org.cloudburstmc.protocol.bedrock.data.AttributeData;
 import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataTypes;
 import org.cloudburstmc.protocol.bedrock.data.entity.EntityEventType;
 import org.cloudburstmc.protocol.bedrock.data.entity.EntityFlag;
@@ -37,6 +39,9 @@
 import org.geysermc.geyser.entity.EntityDefinition;
 import org.geysermc.geyser.entity.attribute.GeyserAttributeType;
 import org.geysermc.geyser.entity.type.living.animal.AnimalEntity;
+import org.geysermc.geyser.entity.vehicle.ClientVehicle;
+import org.geysermc.geyser.entity.vehicle.HorseVehicleComponent;
+import org.geysermc.geyser.entity.vehicle.VehicleComponent;
 import org.geysermc.geyser.input.InputLocksFlag;
 import org.geysermc.geyser.inventory.GeyserItemStack;
 import org.geysermc.geyser.item.Items;
@@ -47,12 +52,16 @@
 import org.geysermc.geyser.util.InteractionResult;
 import org.geysermc.geyser.util.InteractiveTag;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.EquipmentSlot;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.attribute.Attribute;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.attribute.AttributeType;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.player.Hand;
 
 import java.util.UUID;
 
-public class AbstractHorseEntity extends AnimalEntity {
+public class AbstractHorseEntity extends AnimalEntity implements ClientVehicle {
+
+    private final HorseVehicleComponent vehicleComponent = new HorseVehicleComponent(this);
 
     public AbstractHorseEntity(GeyserSession session, int entityId, long geyserId, UUID uuid, EntityDefinition<?> definition, Vector3f position, Vector3f motion, float yaw, float pitch, float headYaw) {
         super(session, entityId, geyserId, uuid, definition, position, motion, yaw, pitch, headYaw);
@@ -94,6 +103,15 @@ public void updateSaddled(boolean saddled) {
         }
     }
 
+    @Override
+    protected AttributeData calculateAttribute(Attribute javaAttribute, GeyserAttributeType type) {
+        AttributeData attributeData = super.calculateAttribute(javaAttribute, type);
+        if (javaAttribute.getType() == AttributeType.Builtin.JUMP_STRENGTH) {
+            vehicleComponent.setHorseJumpStrength(attributeData.getValue());
+        }
+        return attributeData;
+    }
+
     @Override
     public boolean doesJumpDismount() {
         return !this.getFlag(EntityFlag.SADDLED);
@@ -309,4 +327,25 @@ protected boolean canUseSlot(EquipmentSlot slot) {
             return isAlive() && !isBaby() && getFlag(EntityFlag.TAMED);
         }
     }
+
+    @Override
+    public VehicleComponent<?> getVehicleComponent() {
+        return this.vehicleComponent;
+    }
+
+    @Override
+    public Vector3f getRiddenInput(Vector2f input) {
+        input = input.mul(0.5f, input.getY() < 0 ? 0.25f : 1.0f);
+        return Vector3f.from(input.getX(), 0.0, input.getY());
+    }
+
+    @Override
+    public float getVehicleSpeed() {
+        return vehicleComponent.getMoveSpeed();
+    }
+
+    @Override
+    public boolean isClientControlled() {
+        return getFlag(EntityFlag.SADDLED) && !passengers.isEmpty() && passengers.get(0) == session.getPlayerEntity() && !session.isInClientPredictedVehicle();
+    }
 }

core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/CamelEntity.java

@@ -25,7 +25,6 @@
 
 package org.geysermc.geyser.entity.type.living.animal.horse;
 
-import org.cloudburstmc.math.vector.Vector2f;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.cloudburstmc.math.vector.Vector3f;
 import org.cloudburstmc.protocol.bedrock.data.AttributeData;
@@ -152,12 +151,6 @@ public VehicleComponent<?> getVehicleComponent() {
         return vehicleComponent;
     }
 
-    @Override
-    public Vector3f getRiddenInput(Vector2f input) {
-        input = input.mul(0.5f, input.getY() < 0 ? 0.25f : 1.0f);
-        return Vector3f.from(input.getX(), 0.0, input.getY());
-    }
-
     @Override
     public boolean isClientControlled() {
         return getFlag(EntityFlag.SADDLED) && !passengers.isEmpty() && passengers.get(0) == session.getPlayerEntity();