Fix skins not appearing on avatar entities and player heads, update protocol library for further fixes

2025-12-19 14:59:27 +00:00 · 2025-12-10 17:15:01 +01:00
parent 0cdd31ea1f
commit bc8214793e
9 changed files with 28 additions and 139 deletions
--- a/core/src/main/java/org/geysermc/geyser/entity/type/player/MannequinEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/type/player/MannequinEntity.java
@@ -27,11 +27,15 @@ package org.geysermc.geyser.entity.type.player;

 import net.kyori.adventure.text.Component;
 import org.cloudburstmc.math.vector.Vector3f;
+import org.cloudburstmc.protocol.bedrock.packet.PlayerListPacket;
 import org.geysermc.geyser.entity.EntityDefinition;
 import org.geysermc.geyser.session.GeyserSession;
+import org.geysermc.geyser.skin.SkinManager;
+import org.geysermc.geyser.util.PlayerListUtils;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.EntityMetadata;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.player.ResolvableProfile;

+import java.util.List;
 import java.util.Optional;
 import java.util.UUID;

@@ -42,7 +46,10 @@ public class MannequinEntity extends AvatarEntity {
    }

    public void setProfile(EntityMetadata<ResolvableProfile, ?> entityMetadata) {
-        setSkin(entityMetadata.getValue(), true, () -> {});
+        PlayerListUtils.batchSendPlayerList(session, List.of(SkinManager.buildCachedEntry(session, this)), PlayerListPacket.Action.ADD);
+        setSkin(entityMetadata.getValue(), true, () -> {
+            PlayerListUtils.batchSendPlayerList(session, List.of(new PlayerListPacket.Entry(uuid)), PlayerListPacket.Action.REMOVE);
+        });
    }

    @Override
--- a/core/src/main/java/org/geysermc/geyser/entity/type/player/SkullPlayerEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/type/player/SkullPlayerEntity.java
@@ -28,12 +28,9 @@ package org.geysermc.geyser.entity.type.player;
 import lombok.Getter;
 import org.cloudburstmc.math.vector.Vector3f;
 import org.cloudburstmc.math.vector.Vector3i;
-import org.cloudburstmc.protocol.bedrock.data.GameType;
-import org.cloudburstmc.protocol.bedrock.data.PlayerPermission;
-import org.cloudburstmc.protocol.bedrock.data.command.CommandPermission;
 import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataTypes;
 import org.cloudburstmc.protocol.bedrock.data.entity.EntityFlag;
-import org.cloudburstmc.protocol.bedrock.packet.AddPlayerPacket;
+import org.cloudburstmc.protocol.bedrock.packet.PlayerListPacket;
 import org.geysermc.geyser.entity.EntityDefinitions;
 import org.geysermc.geyser.level.block.property.Properties;
 import org.geysermc.geyser.level.block.type.BlockState;
@@ -41,9 +38,10 @@ import org.geysermc.geyser.level.block.type.WallSkullBlock;
 import org.geysermc.geyser.level.physics.Direction;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.session.cache.SkullCache;
-import org.geysermc.geyser.skin.SkullSkinManager;
-import org.geysermc.geyser.translator.item.ItemTranslator;
+import org.geysermc.geyser.skin.SkinManager;
+import org.geysermc.geyser.util.PlayerListUtils;

+import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
@@ -84,10 +82,12 @@ public class SkullPlayerEntity extends AvatarEntity {
            updateBedrockMetadata();

            skullUUID = skull.getUuid();
+            PlayerListUtils.batchSendPlayerList(session, List.of(SkinManager.buildCachedEntry(session, this)), PlayerListPacket.Action.ADD);
            setSkin(skull.getTexturesProperty(), false, () -> session.scheduleInEventLoop(() -> {
                // Delay to minimize split-second "player" pop-in
                setFlag(EntityFlag.INVISIBLE, false);
                updateBedrockMetadata();
+                PlayerListUtils.batchSendPlayerList(session, List.of(new PlayerListPacket.Entry(uuid)), PlayerListPacket.Action.REMOVE);
            }, 250, TimeUnit.MILLISECONDS));
        } else {
            // Just a rotation/position change
--- a/core/src/main/java/org/geysermc/geyser/network/CodecProcessor.java
+++ b/core/src/main/java/org/geysermc/geyser/network/CodecProcessor.java
@@ -83,9 +83,7 @@ import org.cloudburstmc.protocol.bedrock.packet.SettingsCommandPacket;
 import org.cloudburstmc.protocol.bedrock.packet.SimpleEventPacket;
 import org.cloudburstmc.protocol.bedrock.packet.SubChunkRequestPacket;
 import org.cloudburstmc.protocol.bedrock.packet.SubClientLoginPacket;
-import org.cloudburstmc.protocol.bedrock.packet.TextPacket;
 import org.cloudburstmc.protocol.common.util.VarInts;
-import org.geysermc.geyser.network.codec.CustomTextPacketSerializer;

 /**
 * Processes the Bedrock codec to remove or modify unused or unsafe packets and fields.
@@ -307,10 +305,6 @@ class CodecProcessor {
                    .updateSerializer(PlayerInputPacket.class, ILLEGAL_SERIALIZER);
            }

-            if (GameProtocol.is1_21_130orHigher(codec.getProtocolVersion())) {
-                codecBuilder.updateSerializer(TextPacket.class, CustomTextPacketSerializer.INSTANCE);
-            }
-
            if (!Boolean.getBoolean("Geyser.ReceiptPackets")) {
                codecBuilder.updateSerializer(RefreshEntitlementsPacket.class, IGNORED_SERIALIZER);
                codecBuilder.updateSerializer(PurchaseReceiptPacket.class, IGNORED_SERIALIZER);
--- a/core/src/main/java/org/geysermc/geyser/network/GameProtocol.java
+++ b/core/src/main/java/org/geysermc/geyser/network/GameProtocol.java
@@ -35,7 +35,7 @@ import org.cloudburstmc.protocol.bedrock.codec.v827.Bedrock_v827;
 import org.cloudburstmc.protocol.bedrock.codec.v844.Bedrock_v844;
 import org.cloudburstmc.protocol.bedrock.codec.v859.Bedrock_v859;
 import org.cloudburstmc.protocol.bedrock.codec.v860.Bedrock_v860;
-import org.cloudburstmc.protocol.bedrock.codec.v897.Bedrock_v897;
+import org.cloudburstmc.protocol.bedrock.codec.v898.Bedrock_v898;
 import org.cloudburstmc.protocol.bedrock.netty.codec.packet.BedrockPacketCodec;
 import org.geysermc.geyser.api.util.MinecraftVersion;
 import org.geysermc.geyser.impl.MinecraftVersionImpl;
@@ -92,8 +92,7 @@ public final class GameProtocol {
        register(Bedrock_v844.CODEC, "1.21.111", "1.21.112", "1.21.113", "1.21.114");
        register(Bedrock_v859.CODEC, "1.21.120", "1.21.121", "1.21.122", "1.21.123");
        register(Bedrock_v860.CODEC);
-        register(Bedrock_v897.CODEC);
-        register(Bedrock_v897.CODEC.toBuilder().protocolVersion(898).build());
+        register(Bedrock_v898.CODEC);

        MinecraftVersion latestBedrock = SUPPORTED_BEDROCK_VERSIONS.get(SUPPORTED_BEDROCK_VERSIONS.size() - 1);
        DEFAULT_BEDROCK_VERSION = latestBedrock.versionString();
@@ -158,7 +157,7 @@ public final class GameProtocol {
    }

    public static boolean is1_21_130orHigher(int protocolVersion) {
-        return protocolVersion >= Bedrock_v897.CODEC.getProtocolVersion();
+        return protocolVersion >= Bedrock_v898.CODEC.getProtocolVersion();
    }

    /**
--- a/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
+++ b/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
@@ -119,6 +119,10 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {

    private boolean setCorrectCodec(int protocolVersion) {
        BedrockCodec packetCodec = GameProtocol.getBedrockCodec(protocolVersion);
+        // temp fix allowing 1.21.130 preview to join
+        if (protocolVersion == 897) {
+            packetCodec = GameProtocol.getBedrockCodec(898);
+        }
        if (packetCodec == null) {
            // None of our Bedrock codecs support this client version, so we can simply compare it to our default protocol.
            String supportedVersions = GameProtocol.getAllSupportedBedrockVersions();
--- a/core/src/main/java/org/geysermc/geyser/network/codec/CustomTextPacketSerializer.java
+++ b/core/src/main/java/org/geysermc/geyser/network/codec/CustomTextPacketSerializer.java
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 2025 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.geyser.network.codec;
-
-import io.netty.buffer.ByteBuf;
-import org.cloudburstmc.protocol.bedrock.codec.BedrockCodecHelper;
-import org.cloudburstmc.protocol.bedrock.codec.v897.serializer.TextSerializer_v897;
-import org.cloudburstmc.protocol.bedrock.packet.TextPacket;
-import org.cloudburstmc.protocol.common.util.TextConverter;
-
-// Sending empty messages kicks clients with 1.21.130...
-public class CustomTextPacketSerializer extends TextSerializer_v897 {
-
-    public static final CustomTextPacketSerializer INSTANCE = new CustomTextPacketSerializer();
-
-    @Override
-    public void serialize(ByteBuf buffer, BedrockCodecHelper helper, TextPacket packet) {
-        TextPacket.Type type = packet.getType();
-        TextConverter converter = helper.getTextConverter();
-        CharSequence message = packet.getMessage(CharSequence.class);
-        Boolean needsTranslation = converter.needsTranslation(message);
-
-        buffer.writeBoolean(needsTranslation != null ? needsTranslation : packet.isNeedsTranslation());
-        String msg;
-
-        switch (type) {
-            case RAW:
-            case TIP:
-            case SYSTEM:
-                buffer.writeByte(0); // MessageOnly
-                helper.writeString(buffer, "raw");
-                helper.writeString(buffer, "tip");
-                helper.writeString(buffer, "systemMessage");
-                helper.writeString(buffer, "textObjectWhisper");
-                helper.writeString(buffer, "textObjectAnnouncement");
-                helper.writeString(buffer, "textObject");
-                buffer.writeByte(type.ordinal());
-                msg = converter.serialize(message);
-                if (msg.isEmpty()) msg = " ";
-                helper.writeString(buffer, msg);
-                break;
-            case JSON:
-            case WHISPER_JSON:
-            case ANNOUNCEMENT_JSON:
-                buffer.writeByte(0); // MessageOnly
-                helper.writeString(buffer, "raw");
-                helper.writeString(buffer, "tip");
-                helper.writeString(buffer, "systemMessage");
-                helper.writeString(buffer, "textObjectWhisper");
-                helper.writeString(buffer, "textObjectAnnouncement");
-                helper.writeString(buffer, "textObject");
-                buffer.writeByte(type.ordinal());
-                msg = converter.serializeJson(message);
-                if (msg.isEmpty()) msg = " ";
-                helper.writeString(buffer, msg);
-                break;
-            case CHAT:
-            case WHISPER:
-            case ANNOUNCEMENT:
-                buffer.writeByte(1); // AuthorAndMessage
-                helper.writeString(buffer, "chat");
-                helper.writeString(buffer, "whisper");
-                helper.writeString(buffer, "announcement");
-                buffer.writeByte(type.ordinal());
-                helper.writeString(buffer, packet.getSourceName());
-                msg = converter.serialize(message);
-                if (msg.isEmpty()) msg = " ";
-                helper.writeString(buffer, msg);
-                break;
-            case TRANSLATION:
-            case POPUP:
-            case JUKEBOX_POPUP:
-                buffer.writeByte(2); // MessageAndParams
-                helper.writeString(buffer, "translate");
-                helper.writeString(buffer, "popup");
-                helper.writeString(buffer, "jukeboxPopup");
-                buffer.writeByte(type.ordinal());
-                String text = converter.serializeWithArguments(message, packet.getParameters());
-                if (text.isEmpty()) text = " ";
-                helper.writeString(buffer, text);
-                helper.writeArray(buffer, packet.getParameters(), helper::writeString);
-                break;
-            default:
-                throw new UnsupportedOperationException("Unsupported TextType " + type);
-        }
-
-        helper.writeString(buffer, packet.getXuid());
-        helper.writeString(buffer, packet.getPlatformChatId());
-        String filtered = converter.serialize(packet.getFilteredMessage(CharSequence.class));
-        helper.writeOptional(buffer, (s -> !s.isEmpty()), filtered, (buf, codecHelper, s) -> codecHelper.writeString(buf, s));
-    }
-}
--- a/core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java
@@ -50,7 +50,7 @@ import org.cloudburstmc.protocol.bedrock.codec.v827.Bedrock_v827;
 import org.cloudburstmc.protocol.bedrock.codec.v844.Bedrock_v844;
 import org.cloudburstmc.protocol.bedrock.codec.v859.Bedrock_v859;
 import org.cloudburstmc.protocol.bedrock.codec.v860.Bedrock_v860;
-import org.cloudburstmc.protocol.bedrock.codec.v897.Bedrock_v897;
+import org.cloudburstmc.protocol.bedrock.codec.v898.Bedrock_v898;
 import org.cloudburstmc.protocol.bedrock.data.BlockPropertyData;
 import org.cloudburstmc.protocol.bedrock.data.definitions.BlockDefinition;
 import org.geysermc.geyser.GeyserImpl;
@@ -133,7 +133,7 @@ public final class BlockRegistryPopulator {
                .put(ObjectIntPair.of("1_21_110", Bedrock_v859.CODEC.getProtocolVersion()), tag -> tag)
                .put(ObjectIntPair.of("1_21_110", Bedrock_v860.CODEC.getProtocolVersion()), tag -> tag)
                // No changes in .130 block palette either!
-                .put(ObjectIntPair.of("1_21_110", Bedrock_v897.CODEC.getProtocolVersion()), tag -> tag)
+                .put(ObjectIntPair.of("1_21_110", Bedrock_v898.CODEC.getProtocolVersion()), tag -> tag)
            .build();

        // We can keep this strong as nothing should be garbage collected
--- a/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java
@@ -51,7 +51,7 @@ import org.cloudburstmc.protocol.bedrock.codec.v827.Bedrock_v827;
 import org.cloudburstmc.protocol.bedrock.codec.v844.Bedrock_v844;
 import org.cloudburstmc.protocol.bedrock.codec.v859.Bedrock_v859;
 import org.cloudburstmc.protocol.bedrock.codec.v860.Bedrock_v860;
-import org.cloudburstmc.protocol.bedrock.codec.v897.Bedrock_v897;
+import org.cloudburstmc.protocol.bedrock.codec.v898.Bedrock_v898;
 import org.cloudburstmc.protocol.bedrock.data.definitions.BlockDefinition;
 import org.cloudburstmc.protocol.bedrock.data.definitions.ItemDefinition;
 import org.cloudburstmc.protocol.bedrock.data.definitions.SimpleItemDefinition;
@@ -203,7 +203,7 @@ public class ItemRegistryPopulator {
        paletteVersions.add(new PaletteVersion("1_21_110", Bedrock_v844.CODEC.getProtocolVersion()));
        paletteVersions.add(new PaletteVersion("1_21_120", Bedrock_v859.CODEC.getProtocolVersion()));
        paletteVersions.add(new PaletteVersion("1_21_120", Bedrock_v860.CODEC.getProtocolVersion()));
-        paletteVersions.add(new PaletteVersion("1_21_130", Bedrock_v897.CODEC.getProtocolVersion()));
+        paletteVersions.add(new PaletteVersion("1_21_130", Bedrock_v898.CODEC.getProtocolVersion()));

        GeyserBootstrap bootstrap = GeyserImpl.getInstance().getBootstrap();