diff --git 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 index a98754596..ff4c0d15b 100644 --- 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 @@ -26,10 +26,14 @@ package org.geysermc.geyser.entity.type.player; import net.kyori.adventure.text.Component; +import org.cloudburstmc.protocol.bedrock.packet.PlayerListPacket; import org.geysermc.geyser.entity.spawn.EntitySpawnContext; +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; public class MannequinEntity extends AvatarEntity { @@ -39,7 +43,10 @@ public class MannequinEntity extends AvatarEntity { } public void setProfile(EntityMetadata 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 diff --git 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 index 1fa354caa..fbe79545c 100644 --- 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 @@ -30,13 +30,17 @@ import org.cloudburstmc.math.vector.Vector3f; import org.cloudburstmc.math.vector.Vector3i; import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataTypes; import org.cloudburstmc.protocol.bedrock.data.entity.EntityFlag; +import org.cloudburstmc.protocol.bedrock.packet.PlayerListPacket; import org.geysermc.geyser.entity.spawn.EntitySpawnContext; import org.geysermc.geyser.level.block.property.Properties; import org.geysermc.geyser.level.block.type.BlockState; import org.geysermc.geyser.level.block.type.WallSkullBlock; import org.geysermc.geyser.level.physics.Direction; import org.geysermc.geyser.session.cache.SkullCache; +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; @@ -77,10 +81,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 diff --git a/core/src/main/java/org/geysermc/geyser/network/GameProtocol.java b/core/src/main/java/org/geysermc/geyser/network/GameProtocol.java index 35902368d..307a128a0 100644 --- 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,7 +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_v898.CODEC); MinecraftVersion latestBedrock = SUPPORTED_BEDROCK_VERSIONS.get(SUPPORTED_BEDROCK_VERSIONS.size() - 1); DEFAULT_BEDROCK_VERSION = latestBedrock.versionString(); @@ -157,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(); } /** diff --git a/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java b/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java index b7ba7b8b5..de6046e61 100644 --- 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(); diff --git a/core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java b/core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java index 14c825908..5198d88c0 100644 --- 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 diff --git a/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java b/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java index 253748c1d..c7b0279e1 100644 --- 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(); diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5168e5847..7c603e044 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,9 +13,9 @@ guava = "29.0-jre" gson = "2.3.1" # Provided by Spigot 1.8.8 TODO bump to 2.8.1 or similar (Spigot 1.16.5 version) after Merge gson-runtime = "2.10.1" websocket = "1.5.1" -protocol-connection = "3.0.0.Beta11-20251208.164944-9" -protocol-common = "3.0.0.Beta11-20251208.164944-8" -protocol-codec = "3.0.0.Beta11-20251208.164944-9" +protocol-connection = "3.0.0.Beta11-20251209.183710-13" +protocol-common = "3.0.0.Beta11-20251209.183710-12" +protocol-codec = "3.0.0.Beta11-20251209.183710-13" raknet = "1.0.0.CR3-20251208.214317-23" minecraftauth = "5.0.0" mcprotocollib = "1.21.9-feature-custom-entities"