Merge branch 'master' into custom-item-api-v2

Author: eclipseisoffline

README.md

@@ -15,7 +15,7 @@ The ultimate goal of this project is to allow Minecraft: Bedrock Edition users t
 Special thanks to the DragonProxy project for being a trailblazer in protocol translation and for all the team members who have joined us here!
 
 ## Supported Versions
-Geyser is currently supporting Minecraft Bedrock 1.21.90 - 1.21.113 and Minecraft Java 1.21.9 - 1.21.10. For more information, please see [here](https://geysermc.org/wiki/geyser/supported-versions/).
+Geyser is currently supporting Minecraft Bedrock 1.21.90 - 1.21.114 and Minecraft Java 1.21.9 - 1.21.10. For more information, please see [here](https://geysermc.org/wiki/geyser/supported-versions/).
 
 ## Setting Up
 Take a look [here](https://geysermc.org/wiki/geyser/setup/) for how to set up Geyser.

bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePlugin.java

@@ -25,8 +25,6 @@
 
 package org.geysermc.geyser.platform.bungeecord;
 
-import io.netty.buffer.AdaptiveByteBufAllocator;
-import io.netty.buffer.ByteBufAllocator;
 import io.netty.channel.Channel;
 import net.md_5.bungee.BungeeCord;
 import net.md_5.bungee.api.CommandSender;
@@ -84,12 +82,9 @@ public void onLoad() {
     public void onGeyserInitialize() {
         GeyserLocale.init(this);
 
-        // TODO remove when this isn't an issue anymore
-        boolean adaptiveAllocatorUsed = System.getProperty("io.netty.allocator.type") == null && ByteBufAllocator.DEFAULT instanceof AdaptiveByteBufAllocator;
-
         try {
             List<Integer> supportedProtocols = ProtocolConstants.SUPPORTED_VERSION_IDS;
-            if (!supportedProtocols.contains(GameProtocol.getJavaProtocolVersion()) || adaptiveAllocatorUsed) {
+            if (!supportedProtocols.contains(GameProtocol.getJavaProtocolVersion())) {
                 geyserLogger.error("      / \\");
                 geyserLogger.error("     /   \\");
                 geyserLogger.error("    /  |  \\");

bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneBootstrap.java

@@ -89,11 +89,6 @@ public static void main(String[] args) {
             ResourceLeakDetector.setLevel(ResourceLeakDetector.Level.DISABLED); // Can eat performance
         }
 
-        // Restore allocator used before Netty 4.2 due to oom issues with the adaptive allocator
-        if (System.getProperty("io.netty.allocator.type") == null) {
-            System.setProperty("io.netty.allocator.type", "pooled");
-        }
-
         System.setProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager");
         GeyserStandaloneLogger.setupStreams();
 

bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java

@@ -36,8 +36,6 @@
 import com.velocitypowered.api.plugin.Plugin;
 import com.velocitypowered.api.plugin.PluginContainer;
 import com.velocitypowered.api.proxy.ProxyServer;
-import io.netty.buffer.AdaptiveByteBufAllocator;
-import io.netty.buffer.ByteBufAllocator;
 import lombok.Getter;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -93,10 +91,7 @@ public GeyserVelocityPlugin(ProxyServer server, PluginContainer container, Logge
     public void onGeyserInitialize() {
         GeyserLocale.init(this);
 
-        // TODO remove when this isn't an issue anymore
-        boolean adaptiveAllocatorUsed = System.getProperty("io.netty.allocator.type") == null && ByteBufAllocator.DEFAULT instanceof AdaptiveByteBufAllocator;
-
-        if (!ProtocolVersion.isSupported(GameProtocol.getJavaProtocolVersion()) || adaptiveAllocatorUsed) {
+        if (!ProtocolVersion.isSupported(GameProtocol.getJavaProtocolVersion())) {
             geyserLogger.error("      / \\");
             geyserLogger.error("     /   \\");
             geyserLogger.error("    /  |  \\");

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

@@ -29,6 +29,7 @@
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.cloudburstmc.protocol.bedrock.packet.EmotePacket;
+import org.geysermc.geyser.input.InputLocksFlag;
 import org.geysermc.geyser.api.entity.EntityData;
 import org.geysermc.geyser.api.entity.type.GeyserEntity;
 import org.geysermc.geyser.api.entity.type.player.GeyserPlayerEntity;
@@ -87,7 +88,8 @@ public boolean lockMovement(boolean lock, @NonNull UUID owner) {
             movementLockOwners.remove(owner);
         }
 
-        session.lockInputs(session.camera().isCameraLocked(), isMovementLocked());
+        session.setLockInput(InputLocksFlag.MOVEMENT, isMovementLocked());
+        session.updateInputLocks();
         return isMovementLocked();
     }
 

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

@@ -614,6 +614,14 @@ public void setRiderSeatPosition(Vector3f position) {
     protected boolean isShaking() {
         return false;
     }
+    /**
+     * If true, the entity can be dismounted by pressing jump.
+     *
+     * @return whether the entity can be dismounted when pressing jump.
+     */
+    public boolean doesJumpDismount() {
+        return true;
+    }
 
     /**
      * x = Pitch, y = Yaw, z = HeadYaw

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

@@ -43,6 +43,16 @@
 @Getter
 public class TextDisplayEntity extends DisplayBaseEntity {
 
+    /**
+     * The height offset per line of text in a text display entity when rendered
+     * as an armor stand nametag on Bedrock Edition.
+     * <p>
+     * This value was empirically adjusted to match Java Edition's multi-line text
+     * centering behavior. Note that this differs from the 0.1414f multiplier used
+     * in {@link org.geysermc.geyser.util.EntityUtils} for mount offset calculations.
+     */
+    private static final float LINE_HEIGHT_OFFSET = 0.12f;
+
     private int lineCount;
 
     public TextDisplayEntity(GeyserSession session, int entityId, long geyserId, UUID uuid, EntityDefinition<?> definition, Vector3f position, Vector3f motion, float yaw, float pitch, float headYaw) {
@@ -54,9 +64,27 @@ public void moveRelative(double relX, double relY, double relZ, float yaw, float
         super.moveRelative(relX, relY + definition.offset(), relZ, yaw, pitch, isOnGround);
     }
 
+    /**
+     * Calculates the Y offset needed to match Java Edition's text centering
+     * behavior for multi-line text displays.
+     * <p>
+     * In Java Edition, multi-line text displays are centered vertically.
+     * This value differs from the 0.1414f multiplier used in {@link org.geysermc.geyser.util.EntityUtils}
+     * for text displays mounted on players, as this handles the base positioning
+     * rather than mount offset calculations.
+     * 
+     * @return the Y offset to apply based on the number of lines
+     */
+    private float calculateLineOffset() {
+        if (lineCount == 0) {
+            return 0;
+        } 
+        return LINE_HEIGHT_OFFSET * lineCount;
+    }
+
     @Override
     public void moveAbsolute(Vector3f position, float yaw, float pitch, float headYaw, boolean isOnGround, boolean teleported) {
-        super.moveAbsolute(position.add(Vector3f.from(0, definition.offset(), 0)), yaw, pitch, headYaw, isOnGround, teleported);
+        super.moveAbsolute(position.add(0, calculateLineOffset(), 0), yaw, pitch, headYaw, isOnGround, teleported);
     }
 
     @Override
@@ -70,7 +98,14 @@ protected void initializeMetadata() {
 
     public void setText(EntityMetadata<Component, ?> entityMetadata) {
         this.dirtyMetadata.put(EntityDataTypes.NAME, MessageTranslator.convertMessage(entityMetadata.getValue(), session.locale()));
+        
+        int previousLineCount = lineCount;
         calculateLineCount(entityMetadata.getValue());
+
+        // If the line count changed, update the position to account for the new offset
+        if (previousLineCount != lineCount) {
+            moveAbsolute(position, yaw, pitch, headYaw, onGround, false);
+        }
     }
 
     private void calculateLineCount(@Nullable Component text) {

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

@@ -37,6 +37,7 @@
 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.input.InputLocksFlag;
 import org.geysermc.geyser.inventory.GeyserItemStack;
 import org.geysermc.geyser.item.Items;
 import org.geysermc.geyser.item.type.Item;
@@ -85,6 +86,17 @@ public void updateSaddled(boolean saddled) {
         // Shows the jump meter
         setFlag(EntityFlag.CAN_POWER_JUMP, saddled);
         super.updateSaddled(saddled);
+
+        if (this.passengers.contains(session.getPlayerEntity())) {
+            // We want to allow player to press jump again if pressing jump doesn't dismount the entity.
+            this.session.setLockInput(InputLocksFlag.JUMP, this.doesJumpDismount());
+            this.session.updateInputLocks();
+        }
+    }
+
+    @Override
+    public boolean doesJumpDismount() {
+        return !this.getFlag(EntityFlag.SADDLED);
     }
 
     public void setHorseFlags(ByteEntityMetadata entityMetadata) {

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

@@ -43,6 +43,7 @@
 import org.geysermc.geyser.entity.type.BoatEntity;
 import org.geysermc.geyser.entity.type.Entity;
 import org.geysermc.geyser.entity.type.LivingEntity;
+import org.geysermc.geyser.input.InputLocksFlag;
 import org.geysermc.geyser.inventory.GeyserItemStack;
 import org.geysermc.geyser.item.Items;
 import org.geysermc.geyser.level.block.Blocks;
@@ -476,6 +477,10 @@ public void setVehicle(Entity entity) {
             this.vehicle.updateBedrockMetadata();
         }
 
+        // Bedrock player can dismount by pressing jump while Java cannot, so we need to prevent player from jumping to match vanilla behaviour.
+        this.session.setLockInput(InputLocksFlag.JUMP, entity != null && entity.doesJumpDismount());
+        this.session.updateInputLocks();
+
         super.setVehicle(entity);
     }
 

core/src/main/java/org/geysermc/geyser/impl/camera/GeyserCameraData.java

@@ -48,6 +48,7 @@
 import org.geysermc.geyser.api.bedrock.camera.CameraPosition;
 import org.geysermc.geyser.api.bedrock.camera.CameraShake;
 import org.geysermc.geyser.api.bedrock.camera.GuiElement;
+import org.geysermc.geyser.input.InputLocksFlag;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.player.GameMode;
 
@@ -251,7 +252,8 @@ public boolean lockCamera(boolean lock, @NonNull UUID owner) {
             this.cameraLockOwners.remove(owner);
         }
 
-        session.lockInputs(isCameraLocked(), session.entities().isMovementLocked());
+        session.setLockInput(InputLocksFlag.CAMERA, isCameraLocked());
+        session.updateInputLocks();
         return isCameraLocked();
     }