Merge remote-tracking branch 'upstream/master' into client-vehicle

core/src/main/java/org/geysermc/geyser/entity/EntityDefinition.java

@@ -47,6 +47,7 @@
  * metadata translators needed to translate the properties sent from the server. The translators are structured in such
  * a way that inserting a new one (for example in version updates) is convenient.
  *
+ * @param identifier the Bedrock identifier of this entity
  * @param <T> the entity type this definition represents
  */
 public record EntityDefinition<T extends Entity>(EntityFactory<T> factory, EntityType entityType, String identifier,

core/src/main/java/org/geysermc/geyser/entity/type/player/SessionPlayerEntity.java

@@ -27,16 +27,19 @@
 
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import lombok.Getter;
+import lombok.Setter;
 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.EntityFlag;
+import org.cloudburstmc.protocol.bedrock.packet.MovePlayerPacket;
 import org.cloudburstmc.protocol.bedrock.packet.UpdateAttributesPacket;
 import org.geysermc.geyser.entity.attribute.GeyserAttributeType;
 import org.geysermc.geyser.item.Items;
 import org.geysermc.geyser.network.GameProtocol;
+import org.geysermc.geyser.level.BedrockDimension;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.util.AttributeUtils;
 import org.geysermc.geyser.util.DimensionUtils;
@@ -81,6 +84,15 @@ public class SessionPlayerEntity extends PlayerEntity {
 
     private int lastAirSupply = getMaxAir();
 
+    /**
+     * Determines if our position is currently out-of-sync with the Java server
+     * due to our workaround for the void floor
+     * <p>
+     * Must be reset when dying, switching worlds, or being teleported out of the void
+     */
+    @Getter @Setter
+    private boolean voidPositionDesynched;
+
     public SessionPlayerEntity(GeyserSession session) {
         super(session, -1, 1, null, Vector3f.ZERO, Vector3f.ZERO, 0, 0, 0, null, null);
 
@@ -99,10 +111,25 @@ public void spawnEntity() {
 
     @Override
     public void moveRelative(double relX, double relY, double relZ, float yaw, float pitch, float headYaw, boolean isOnGround) {
+        if (voidPositionDesynched) {
+            if (!isBelowVoidFloor()) {
+                voidPositionDesynched = false; // No need to fix our offset; we've been moved
+            }
+        }
         super.moveRelative(relX, relY, relZ, yaw, pitch, headYaw, isOnGround);
         session.getCollisionManager().updatePlayerBoundingBox(this.position.down(definition.offset()));
     }
 
+    @Override
+    public void moveAbsolute(Vector3f position, float yaw, float pitch, float headYaw, boolean isOnGround, boolean teleported) {
+        if (voidPositionDesynched) {
+            if (!isBelowVoidFloor()) {
+                voidPositionDesynched = false; // No need to fix our offset; we've been moved
+            }
+        }
+        super.moveAbsolute(position, yaw, pitch, headYaw, isOnGround, teleported);
+    }
+
     @Override
     public void setPosition(Vector3f position) {
         if (valid) { // Don't update during session init
@@ -237,6 +264,9 @@ public void setLastDeathPosition(@Nullable GlobalPos pos) {
         } else {
             dirtyMetadata.put(EntityDataTypes.PLAYER_HAS_DIED, false);
         }
+
+        // We're either respawning or switching worlds, either way, we are no longer desynched
+        this.setVoidPositionDesynched(false);
     }
 
     @Override
@@ -299,4 +329,48 @@ public void setVehicleInput(Vector2f vehicleInput) {
     public void setVehicleJumpStrength(int vehicleJumpStrength) {
         this.vehicleJumpStrength = MathUtils.constrain(vehicleJumpStrength, 0, 100);
     }
+
+    private boolean isBelowVoidFloor() {
+        return position.getY() < voidFloorPosition();
+    }
+
+    public int voidFloorPosition() {
+        // The void floor is offset about 40 blocks below the bottom of the world
+        BedrockDimension bedrockDimension = session.getChunkCache().getBedrockDimension();
+        return bedrockDimension.minY() - 40;
+    }
+
+    /**
+     * This method handles teleporting the player below or above the Bedrock void floor.
+     * The Java server should never see this desync as we adjust the position that we send to it
+     *
+     * @param up in which direction to teleport - true to resync our position, or false to be
+     *           teleported below the void floor.
+     */
+    public void teleportVoidFloorFix(boolean up) {
+        // Safety to avoid double teleports
+        if ((voidPositionDesynched && !up) || (!voidPositionDesynched && up)) {
+            return;
+        }
+
+        // Work around there being a floor at the bottom of the world and teleport the player below it
+        // Moving from below to above the void floor works fine
+        Vector3f newPosition = this.getPosition();
+        if (up) {
+            newPosition = newPosition.up(4f);
+            voidPositionDesynched = false;
+        } else {
+            newPosition = newPosition.down(4f);
+            voidPositionDesynched = true;
+        }
+
+        this.setPositionManual(newPosition);
+        MovePlayerPacket movePlayerPacket = new MovePlayerPacket();
+        movePlayerPacket.setRuntimeEntityId(geyserId);
+        movePlayerPacket.setPosition(newPosition);
+        movePlayerPacket.setRotation(getBedrockRotation());
+        movePlayerPacket.setMode(MovePlayerPacket.Mode.TELEPORT);
+        movePlayerPacket.setTeleportationCause(MovePlayerPacket.TeleportationCause.BEHAVIOR);
+        session.sendUpstreamPacketImmediately(movePlayerPacket);
+    }
 }

core/src/main/java/org/geysermc/geyser/item/type/FilledMapItem.java

@@ -51,6 +51,7 @@ public ItemData.Builder translateToBedrock(int count, DataComponents components,
                 switch (mapColor) {
                     case 3830373 -> builder.damage(3); // Ocean Monument
                     case 5393476 -> builder.damage(4); // Woodland explorer
+                    case 12741452 -> builder.damage(14); // Trial Chamber
                 }
             }
         }

core/src/main/java/org/geysermc/geyser/level/BedrockMapIcon.java

@@ -63,7 +63,8 @@ public enum BedrockMapIcon {
     ICON_SNOWY_VILLAGE(MapIconType.SNOWY_VILLAGE, 20),
     ICON_TAIGA_VILLAGE(MapIconType.TAIGA_VILLAGE, 21),
     ICON_JUNGLE_TEMPLE(MapIconType.JUNGLE_TEMPLE, 22),
-    ICON_SWAMP_HUT(MapIconType.SWAMP_HUT, 23);
+    ICON_SWAMP_HUT(MapIconType.SWAMP_HUT, 23),
+    ICON_TRIAL_CHAMBERS(MapIconType.TRIAL_CHAMBERS, 24);
 
     private static final BedrockMapIcon[] VALUES = values();
 

core/src/main/java/org/geysermc/geyser/translator/item/ItemTranslator.java

@@ -418,13 +418,15 @@ public static String getCustomName(GeyserSession session, DataComponents compone
         if (components != null) {
             // ItemStack#getHoverName as of 1.20.5
             Component customName = components.get(DataComponentType.CUSTOM_NAME);
-            if (customName == null) {
-                customName = components.get(DataComponentType.ITEM_NAME);
-            }
             if (customName != null) {
-                // Get the translated name and prefix it with a reset char
                 return MessageTranslator.convertMessage(customName, session.locale());
             }
+            customName = components.get(DataComponentType.ITEM_NAME);
+            if (customName != null) {
+                // Get the translated name and prefix it with a reset char to prevent italics - matches Java Edition
+                // behavior as of 1.21
+                return ChatColor.RESET + ChatColor.ESCAPE + translationColor + MessageTranslator.convertMessage(customName, session.locale());
+            }
         }
 
         if (mapping.hasTranslation()) {

core/src/main/java/org/geysermc/geyser/translator/level/block/entity/SpawnerBlockEntityTranslator.java

@@ -107,7 +107,7 @@ public void translateTag(GeyserSession session, NbtMapBuilder bedrockNbt, NbtMap
         bedrockNbt.put("isMovable", (byte) 1);
     }
 
-    static void translateSpawnData(@NonNull NbtMapBuilder builder, @Nullable NbtMap spawnData) {
+    private static void translateSpawnData(@NonNull NbtMapBuilder builder, @Nullable NbtMap spawnData) {
         if (spawnData == null) {
             return;
         }

core/src/main/java/org/geysermc/geyser/translator/level/block/entity/TrialSpawnerBlockEntityTranslator.java

@@ -27,22 +27,31 @@
 
 import org.cloudburstmc.nbt.NbtMap;
 import org.cloudburstmc.nbt.NbtMapBuilder;
+import org.geysermc.geyser.entity.EntityDefinition;
 import org.geysermc.geyser.level.block.type.BlockState;
+import org.geysermc.geyser.registry.Registries;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.mcprotocollib.protocol.data.game.level.block.BlockEntityType;
 
 @BlockEntity(type = BlockEntityType.TRIAL_SPAWNER)
 public class TrialSpawnerBlockEntityTranslator extends BlockEntityTranslator {
+    // Note that it would appear block entity updates don't include the NBT, but we do need it on chunk load.
     @Override
     public void translateTag(GeyserSession session, NbtMapBuilder bedrockNbt, NbtMap javaNbt, BlockState blockState) {
         if (javaNbt == null) {
             return;
         }
 
-        // trial spawners have "spawn_data" instead of "SpawnData"
-        SpawnerBlockEntityTranslator.translateSpawnData(bedrockNbt, javaNbt.getCompound("spawn_data", null));
-
-        // Because trial spawners don't exist on bedrock yet
-        bedrockNbt.put("id", "MobSpawner");
+        NbtMap entityData = javaNbt.getCompound("spawn_data").getCompound("entity");
+        if (entityData.isEmpty()) {
+            return;
+        }
+        NbtMapBuilder spawnData = NbtMap.builder();
+        EntityDefinition<?> definition = Registries.JAVA_ENTITY_IDENTIFIERS.get(entityData.getString("id"));
+        if (definition != null) {
+            spawnData.putString("TypeId", definition.identifier());
+        }
+        spawnData.putInt("Weight", entityData.getInt("Size", 1)); // ??? presumably since these are the only other two extra attributes
+        bedrockNbt.putCompound("spawn_data", spawnData.build());
     }
 }

core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockMovePlayerTranslator.java

@@ -25,20 +25,19 @@
 
 package org.geysermc.geyser.translator.protocol.bedrock.entity.player;
 
-import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundMovePlayerPosPacket;
-import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundMovePlayerPosRotPacket;
-import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundMovePlayerRotPacket;
-import org.geysermc.mcprotocollib.network.packet.Packet;
 import org.cloudburstmc.math.vector.Vector3d;
 import org.cloudburstmc.math.vector.Vector3f;
 import org.cloudburstmc.protocol.bedrock.packet.MovePlayerPacket;
 import org.geysermc.geyser.entity.EntityDefinitions;
 import org.geysermc.geyser.entity.type.player.SessionPlayerEntity;
-import org.geysermc.geyser.level.BedrockDimension;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.text.ChatColor;
 import org.geysermc.geyser.translator.protocol.PacketTranslator;
 import org.geysermc.geyser.translator.protocol.Translator;
+import org.geysermc.mcprotocollib.network.packet.Packet;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundMovePlayerPosPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundMovePlayerPosRotPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundMovePlayerRotPacket;
 
 @Translator(packet = MovePlayerPacket.class)
 public class BedrockMovePlayerTranslator extends PacketTranslator<MovePlayerPacket> {
@@ -93,37 +92,50 @@ public void translate(GeyserSession session, MovePlayerPacket packet) {
                 Vector3d position = session.getCollisionManager().adjustBedrockPosition(packet.getPosition(), packet.isOnGround(), packet.getMode() == MovePlayerPacket.Mode.TELEPORT);
                 if (position != null) { // A null return value cancels the packet
                     boolean onGround = packet.isOnGround();
+                    boolean isBelowVoid = entity.isVoidPositionDesynched();
 
-                    boolean teleportThroughVoidFloor;
+                    boolean teleportThroughVoidFloor, mustResyncPosition;
                     // Compare positions here for void floor fix below before the player's position variable is set to the packet position
-                    if (entity.getPosition().getY() >= packet.getPosition().getY()) {
+                    if (entity.getPosition().getY() >= packet.getPosition().getY() && !isBelowVoid) {
                         int floorY = position.getFloorY();
-                        // The void floor is offset about 40 blocks below the bottom of the world
-                        BedrockDimension bedrockDimension = session.getChunkCache().getBedrockDimension();
-                        int voidFloorLocation = bedrockDimension.minY() - 40;
-                        teleportThroughVoidFloor = floorY <= (voidFloorLocation + 2) && floorY >= voidFloorLocation;
-                        if (teleportThroughVoidFloor) {
-                            // https://github.com/GeyserMC/Geyser/issues/3521 - no void floor in Java so we cannot be on the ground.
-                            onGround = false;
-                        }
+                        int voidFloorLocation = entity.voidFloorPosition();
+                        teleportThroughVoidFloor = floorY <= (voidFloorLocation + 1) && floorY >= voidFloorLocation;
                     } else {
                         teleportThroughVoidFloor = false;
                     }
 
+                    if (teleportThroughVoidFloor || isBelowVoid) {
+                        // https://github.com/GeyserMC/Geyser/issues/3521 - no void floor in Java so we cannot be on the ground.
+                        onGround = false;
+                    }
+
+                    if (isBelowVoid) {
+                        int floorY = position.getFloorY();
+                        int voidFloorLocation = entity.voidFloorPosition();
+                        mustResyncPosition = floorY < voidFloorLocation && floorY >= voidFloorLocation - 1;
+                    } else {
+                        mustResyncPosition = false;
+                    }
+
+                    double yPosition = position.getY();
+                    if (entity.isVoidPositionDesynched()) { // not using the cached variable on purpose
+                        yPosition += 4; // We are de-synched since we had to teleport below the void floor.
+                    }
+
                     Packet movePacket;
                     if (rotationChanged) {
                         // Send rotation updates as well
                         movePacket = new ServerboundMovePlayerPosRotPacket(
                                 onGround,
-                                position.getX(), position.getY(), position.getZ(),
+                                position.getX(), yPosition, position.getZ(),
                                 yaw, pitch
                         );
                         entity.setYaw(yaw);
                         entity.setPitch(pitch);
                         entity.setHeadYaw(headYaw);
                     } else {
                         // Rotation did not change; don't send an update with rotation
-                        movePacket = new ServerboundMovePlayerPosPacket(onGround, position.getX(), position.getY(), position.getZ());
+                        movePacket = new ServerboundMovePlayerPosPacket(onGround, position.getX(), yPosition, position.getZ());
                     }
 
                     entity.setPositionManual(packet.getPosition());
@@ -133,16 +145,9 @@ public void translate(GeyserSession session, MovePlayerPacket packet) {
                     session.sendDownstreamGamePacket(movePacket);
 
                     if (teleportThroughVoidFloor) {
-                        // Work around there being a floor at the bottom of the world and teleport the player below it
-                        // Moving from below to above the void floor works fine
-                        entity.setPosition(entity.getPosition().sub(0, 4f, 0));
-                        MovePlayerPacket movePlayerPacket = new MovePlayerPacket();
-                        movePlayerPacket.setRuntimeEntityId(entity.getGeyserId());
-                        movePlayerPacket.setPosition(entity.getPosition());
-                        movePlayerPacket.setRotation(entity.getBedrockRotation());
-                        movePlayerPacket.setMode(MovePlayerPacket.Mode.TELEPORT);
-                        movePlayerPacket.setTeleportationCause(MovePlayerPacket.TeleportationCause.BEHAVIOR);
-                        session.sendUpstreamPacket(movePlayerPacket);
+                        entity.teleportVoidFloorFix(false);
+                    } else if (mustResyncPosition) {
+                        entity.teleportVoidFloorFix(true);
                     }
 
                     session.getSkullCache().updateVisibleSkulls();