From 220217fcc1030441f1d2c3f6e96d3d4ca68331f3 Mon Sep 17 00:00:00 2001 From: TheMode Date: Wed, 7 Dec 2022 18:21:28 +0100 Subject: [PATCH] Make tests compile Signed-off-by: TheMode --- .../net/minestom/server/entity/Player.java | 2 +- .../server/play/PlayerInfoRemovePacket.java | 4 ++++ .../server/network/PacketWriteReadTest.java | 23 +++++++++---------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/main/java/net/minestom/server/entity/Player.java b/src/main/java/net/minestom/server/entity/Player.java index b13b202cc..ef948715e 100644 --- a/src/main/java/net/minestom/server/entity/Player.java +++ b/src/main/java/net/minestom/server/entity/Player.java @@ -1918,7 +1918,7 @@ public class Player extends LivingEntity implements CommandSender, Localizable, * @return a {@link PlayerInfoRemovePacket} to remove the player */ protected @NotNull PlayerInfoRemovePacket getRemovePlayerToList() { - return new PlayerInfoRemovePacket(List.of(getUuid())); + return new PlayerInfoRemovePacket(getUuid()); } private PlayerInfoUpdatePacket.Entry infoEntry() { diff --git a/src/main/java/net/minestom/server/network/packet/server/play/PlayerInfoRemovePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/PlayerInfoRemovePacket.java index bba6a89ca..3eb2d15db 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/PlayerInfoRemovePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/PlayerInfoRemovePacket.java @@ -9,6 +9,10 @@ import java.util.List; import java.util.UUID; public record PlayerInfoRemovePacket(@NotNull List<@NotNull UUID> uuids) implements ServerPacket { + public PlayerInfoRemovePacket(@NotNull UUID uuid) { + this(List.of(uuid)); + } + public PlayerInfoRemovePacket { uuids = List.copyOf(uuids); } diff --git a/src/test/java/net/minestom/server/network/PacketWriteReadTest.java b/src/test/java/net/minestom/server/network/PacketWriteReadTest.java index ead02aaa7..b37a201aa 100644 --- a/src/test/java/net/minestom/server/network/PacketWriteReadTest.java +++ b/src/test/java/net/minestom/server/network/PacketWriteReadTest.java @@ -7,6 +7,7 @@ import net.minestom.server.coordinate.Vec; import net.minestom.server.entity.EquipmentSlot; import net.minestom.server.entity.GameMode; import net.minestom.server.entity.Metadata; +import net.minestom.server.entity.PlayerSkin; import net.minestom.server.item.ItemStack; import net.minestom.server.item.Material; import net.minestom.server.network.packet.client.ClientPacket; @@ -110,18 +111,16 @@ public class PacketWriteReadTest { SERVER_PACKETS.add(new EntityPropertiesPacket(5, List.of())); SERVER_PACKETS.add(new EntityRotationPacket(5, 45f, 45f, false)); - SERVER_PACKETS.add(new PlayerInfoPacket(PlayerInfoPacket.Action.UPDATE_DISPLAY_NAME, - new PlayerInfoPacket.UpdateDisplayName(UUID.randomUUID(), COMPONENT))); - SERVER_PACKETS.add(new PlayerInfoPacket(PlayerInfoPacket.Action.UPDATE_DISPLAY_NAME, - new PlayerInfoPacket.UpdateDisplayName(UUID.randomUUID(), (Component) null))); - SERVER_PACKETS.add(new PlayerInfoPacket(PlayerInfoPacket.Action.UPDATE_GAMEMODE, - new PlayerInfoPacket.UpdateGameMode(UUID.randomUUID(), GameMode.CREATIVE))); - SERVER_PACKETS.add(new PlayerInfoPacket(PlayerInfoPacket.Action.UPDATE_LATENCY, - new PlayerInfoPacket.UpdateLatency(UUID.randomUUID(), 5))); - SERVER_PACKETS.add(new PlayerInfoPacket(PlayerInfoPacket.Action.ADD_PLAYER, - new PlayerInfoPacket.AddPlayer(UUID.randomUUID(), "TheMode911", - List.of(new PlayerInfoPacket.AddPlayer.Property("name", "value")), GameMode.CREATIVE, 5, COMPONENT, null))); - SERVER_PACKETS.add(new PlayerInfoPacket(PlayerInfoPacket.Action.REMOVE_PLAYER, new PlayerInfoPacket.RemovePlayer(UUID.randomUUID()))); + final PlayerSkin skin = new PlayerSkin("hh", "hh"); + List prop = List.of(new PlayerInfoUpdatePacket.Property("textures", skin.textures(), skin.signature())); + var entry = new PlayerInfoUpdatePacket.Entry(UUID.randomUUID(), "TheMode911", prop, + true, 5, GameMode.CREATIVE, Component.text("display")); + + SERVER_PACKETS.add(new PlayerInfoUpdatePacket(PlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME, entry)); + SERVER_PACKETS.add(new PlayerInfoUpdatePacket(PlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE, entry)); + SERVER_PACKETS.add(new PlayerInfoUpdatePacket(PlayerInfoUpdatePacket.Action.UPDATE_LATENCY, entry)); + SERVER_PACKETS.add(new PlayerInfoUpdatePacket(PlayerInfoUpdatePacket.Action.UPDATE_LISTED, entry)); + SERVER_PACKETS.add(new PlayerInfoRemovePacket(UUID.randomUUID())); //SERVER_PACKETS.add(new MultiBlockChangePacket(5,5,5,true, new long[]{0,5,543534,1321})); }