22w42 (except for command completions)

2024-11-25 19:45:21 +01:00 · 2022-10-20 19:34:04 +02:00 · 2022-10-20 19:34:04 +02:00 · 7400784e4f
commit 7400784e4f
parent 2154f0a2cf
7 changed files with 292 additions and 195 deletions
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/ByteArrayType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/ByteArrayType.java
@ -42,18 +42,20 @@ public class ByteArrayType extends Type<byte[]> {
    }

    @Override
-    public void write(ByteBuf buffer, byte[] object) throws Exception {
-        Preconditions.checkArgument(length == -1 || length == object.length, "Length does not match expected length");
-        Type.VAR_INT.writePrimitive(buffer, object.length);
+    public void write(final ByteBuf buffer, final byte[] object) throws Exception {
+        if (this.length != -1) {
+            Preconditions.checkArgument(length == object.length, "Length does not match expected length");
+        } else {
+            Type.VAR_INT.writePrimitive(buffer, object.length);
+        }
        buffer.writeBytes(object);
    }

    @Override
-    public byte[] read(ByteBuf buffer) throws Exception {
-        int length = Type.VAR_INT.readPrimitive(buffer);
+    public byte[] read(final ByteBuf buffer) throws Exception {
+        final int length = this.length == -1 ? Type.VAR_INT.readPrimitive(buffer) : this.length;
        Preconditions.checkArgument(buffer.isReadable(length), "Length is fewer than readable bytes");
-        Preconditions.checkArgument(this.length == -1 || this.length == length, "Length does not match expected length");
-        byte[] array = new byte[length];
+        final byte[] array = new byte[length];
        buffer.readBytes(array);
        return array;
    }
@ -63,5 +65,9 @@ public class ByteArrayType extends Type<byte[]> {
        public OptionalByteArrayType() {
            super(Type.BYTE_ARRAY_PRIMITIVE);
        }
+
+        public OptionalByteArrayType(final int length) {
+            super(new ByteArrayType(length));
+        }
    }
 }
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/ClientboundPackets1_19_3.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/ClientboundPackets1_19_3.java
@ -33,20 +33,20 @@ public enum ClientboundPackets1_19_3 implements ClientboundPacketType {
    BLOCK_CHANGE, // 0x09
    BOSSBAR, // 0x0A
    SERVER_DIFFICULTY, // 0x0B
-    CLEAR_TITLES, // 0x0D
-    TAB_COMPLETE, // 0x0E
-    DECLARE_COMMANDS, // 0x0F
-    CLOSE_WINDOW, // 0x10
-    WINDOW_ITEMS, // 0x11
-    WINDOW_PROPERTY, // 0x12
-    SET_SLOT, // 0x13
-    COOLDOWN, // 0x14
-    CUSTOM_CHAT_COMPLETIONS, // 0x15
-    PLUGIN_MESSAGE, // 0x16
-    NAMED_SOUND, // 0x17
-    DELETE_CHAT_MESSAGE, // 0x18
-    DISCONNECT, // 0x19
-    DISGUISED_CHAT,
+    CLEAR_TITLES, // 0x0C
+    TAB_COMPLETE, // 0x0D
+    DECLARE_COMMANDS, // 0x0E
+    CLOSE_WINDOW, // 0x0F
+    WINDOW_ITEMS, // 0x10
+    WINDOW_PROPERTY, // 0x11
+    SET_SLOT, // 0x12
+    COOLDOWN, // 0x13
+    CUSTOM_CHAT_COMPLETIONS, // 0x14
+    PLUGIN_MESSAGE, // 0x15
+    NAMED_SOUND, // 0x16
+    DELETE_CHAT_MESSAGE, // 0x17
+    DISCONNECT, // 0x18
+    DISGUISED_CHAT, // 0x19
    ENTITY_STATUS, // 0x1A
    EXPLOSION, // 0x1B
    UNLOAD_CHUNK, // 0x1C
@ -71,12 +71,12 @@ public enum ClientboundPackets1_19_3 implements ClientboundPacketType {
    PING, // 0x2F
    CRAFT_RECIPE_RESPONSE, // 0x30
    PLAYER_ABILITIES, // 0x31
-    PLAYER_CHAT, // 0x33
-    COMBAT_END, // 0x34
-    COMBAT_ENTER, // 0x35
-    COMBAT_KILL, // 0x36
-    PLAYER_INFO_REMOVE, // 0x37
-    PLAYER_INFO_UPDATE,
+    PLAYER_CHAT, // 0x32
+    COMBAT_END, // 0x33
+    COMBAT_ENTER, // 0x34
+    COMBAT_KILL, // 0x35
+    PLAYER_INFO_REMOVE, // 0x36
+    PLAYER_INFO_UPDATE, // 0x37
    FACE_PLAYER, // 0x38
    PLAYER_POSITION, // 0x39
    UNLOCK_RECIPES, // 0x3A
@ -99,33 +99,33 @@ public enum ClientboundPackets1_19_3 implements ClientboundPacketType {
    UPDATE_VIEW_POSITION, // 0x4B
    UPDATE_VIEW_DISTANCE, // 0x4C
    SPAWN_POSITION, // 0x4D
-    DISPLAY_SCOREBOARD, // 0x4F
-    ENTITY_METADATA, // 0x50
-    ATTACH_ENTITY, // 0x51
-    ENTITY_VELOCITY, // 0x52
-    ENTITY_EQUIPMENT, // 0x53
-    SET_EXPERIENCE, // 0x54
-    UPDATE_HEALTH, // 0x55
-    SCOREBOARD_OBJECTIVE, // 0x56
-    SET_PASSENGERS, // 0x57
-    TEAMS, // 0x58
-    UPDATE_SCORE, // 0x59
-    SET_SIMULATION_DISTANCE, // 0x5A
-    TITLE_SUBTITLE, // 0x5B
-    TIME_UPDATE, // 0x5C
-    TITLE_TEXT, // 0x5D
-    TITLE_TIMES, // 0x5E
-    ENTITY_SOUND, // 0x5F
-    SOUND, // 0x60
-    STOP_SOUND, // 0x61
-    SYSTEM_CHAT, // 0x62
-    TAB_LIST, // 0x63
-    NBT_QUERY, // 0x64
-    COLLECT_ITEM, // 0x65
-    ENTITY_TELEPORT, // 0x66
-    ADVANCEMENTS, // 0x67
-    ENTITY_PROPERTIES, // 0x68
-    UPDATE_ENABLED_FEATURES,
+    DISPLAY_SCOREBOARD, // 0x4E
+    ENTITY_METADATA, // 0x4F
+    ATTACH_ENTITY, // 0x50
+    ENTITY_VELOCITY, // 0x51
+    ENTITY_EQUIPMENT, // 0x52
+    SET_EXPERIENCE, // 0x53
+    UPDATE_HEALTH, // 0x54
+    SCOREBOARD_OBJECTIVE, // 0x55
+    SET_PASSENGERS, // 0x56
+    TEAMS, // 0x57
+    UPDATE_SCORE, // 0x58
+    SET_SIMULATION_DISTANCE, // 0x59
+    TITLE_SUBTITLE, // 0x5A
+    TIME_UPDATE, // 0x5B
+    TITLE_TEXT, // 0x5C
+    TITLE_TIMES, // 0x5D
+    ENTITY_SOUND, // 0x5E
+    SOUND, // 0x5F
+    STOP_SOUND, // 0x60
+    SYSTEM_CHAT, // 0x61
+    TAB_LIST, // 0x62
+    NBT_QUERY, // 0x63
+    COLLECT_ITEM, // 0x64
+    ENTITY_TELEPORT, // 0x65
+    ADVANCEMENTS, // 0x66
+    ENTITY_PROPERTIES, // 0x67
+    UPDATE_ENABLED_FEATURES, // 0x68
    ENTITY_EFFECT, // 0x69
    DECLARE_RECIPES, // 0x6A
    TAGS; // 0x6B
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/Protocol1_19_3To1_19_1.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/Protocol1_19_3To1_19_1.java
@ -39,25 +39,26 @@ import com.viaversion.viaversion.api.type.types.version.Types1_19_3;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.libs.kyori.adventure.text.Component;
 import com.viaversion.viaversion.libs.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
+import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets;
 import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets;
 import com.viaversion.viaversion.protocols.protocol1_19_1to1_19.ClientboundPackets1_19_1;
 import com.viaversion.viaversion.protocols.protocol1_19_1to1_19.ServerboundPackets1_19_1;
 import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.packets.EntityPackets;
 import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.packets.InventoryPackets;
+import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.storage.NonceStorage;
 import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.storage.ReceivedMessagesStorage;
 import com.viaversion.viaversion.rewriter.CommandRewriter;
 import com.viaversion.viaversion.rewriter.SoundRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
+import com.viaversion.viaversion.util.CipherUtil;

-import java.util.BitSet;
 import java.util.UUID;

 public final class Protocol1_19_3To1_19_1 extends AbstractProtocol<ClientboundPackets1_19_1, ClientboundPackets1_19_3, ServerboundPackets1_19_1, ServerboundPackets1_19_3> {

    public static final MappingData MAPPINGS = new MappingDataBase("1.19", "1.19.3", true);
-    private static final BitSetType PROFILE_ACTIONS_ENUM_TYPE = new BitSetType(5);
-    private static final ByteArrayType MESSAGE_SIGNATURE_BYTES_TYPE = new ByteArrayType(256);
+    private static final ByteArrayType.OptionalByteArrayType OPTIONAL_MESSAGE_SIGNATURE_BYTES_TYPE = new ByteArrayType.OptionalByteArrayType(256);
    private static final UUID ZERO_UUID = new UUID(0, 0);
    private static final byte[] EMPTY_BYTES = new byte[0];
    private final EntityPackets entityRewriter = new EntityPackets(this);
@ -69,9 +70,6 @@ public final class Protocol1_19_3To1_19_1 extends AbstractProtocol<ClientboundPa

    @Override
    protected void registerPackets() {
-        // TODO login probably fucked
-        // TODO entities
-        // TODO packet enum ids
        final TagRewriter tagRewriter = new TagRewriter(this);
        tagRewriter.registerGeneric(ClientboundPackets1_19_1.TAGS);

@ -129,75 +127,12 @@ public final class Protocol1_19_3To1_19_1 extends AbstractProtocol<ClientboundPa
                    }

                    wrapper.passthrough(Type.VAR_INT); // Root node index
+
+                    wrapper.cancel(); //TODO
                });
            }
        });

-        registerClientbound(ClientboundPackets1_19_1.PLAYER_INFO, ClientboundPackets1_19_3.PLAYER_INFO_UPDATE, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(wrapper -> {
-                    final int action = wrapper.read(Type.VAR_INT);
-                    if (action == 4) { // Remove player
-                        // Write into new packet type
-                        final int entries = wrapper.passthrough(Type.VAR_INT);
-                        final UUID[] uuidsToRemove = new UUID[entries];
-                        for (int i = 0; i < entries; i++) {
-                            uuidsToRemove[i] = wrapper.read(Type.UUID);
-                        }
-                        wrapper.write(Type.UUID_ARRAY, uuidsToRemove);
-                        wrapper.setPacketType(ClientboundPackets1_19_3.PLAYER_INFO_REMOVE);
-                        return;
-                    }
-
-                    final BitSet set = new BitSet(5);
-                    if (action == 0) {
-                        // Includes profile key, gamemode, latency, and display name update - also update listed
-                        set.set(0, 5);
-                    } else {
-                        // Update listed added at 3, initialize chat added at index 1
-                        set.set(action > 2 ? action + 2 : action + 1);
-                    }
-
-                    wrapper.write(PROFILE_ACTIONS_ENUM_TYPE, set);
-                    final int entries = wrapper.passthrough(Type.VAR_INT);
-                    for (int i = 0; i < entries; i++) {
-                        wrapper.passthrough(Type.UUID); // UUID
-                        if (action == 0) { // Add player
-                            wrapper.passthrough(Type.STRING); // Player Name
-
-                            final int properties = wrapper.passthrough(Type.VAR_INT);
-                            for (int j = 0; j < properties; j++) {
-                                wrapper.passthrough(Type.STRING); // Name
-                                wrapper.passthrough(Type.STRING); // Value
-                                if (wrapper.passthrough(Type.BOOLEAN)) {
-                                    wrapper.passthrough(Type.STRING); // Signature
-                                }
-                            }
-
-                            final int gamemode = wrapper.read(Type.VAR_INT);
-                            final int ping = wrapper.read(Type.VAR_INT);
-                            final JsonElement displayName = wrapper.read(Type.BOOLEAN) ? wrapper.read(Type.COMPONENT) : null;
-                            final ProfileKey profileKey = wrapper.read(Type.OPTIONAL_PROFILE_KEY);
-
-                            // Salvage signed chat
-                            wrapper.write(Type.UUID, UUID.randomUUID());
-                            wrapper.write(Type.OPTIONAL_PROFILE_KEY, profileKey);
-
-                            wrapper.write(Type.VAR_INT, gamemode);
-                            wrapper.write(Type.BOOLEAN, true); // Also update listed
-                            wrapper.write(Type.VAR_INT, ping);
-                            wrapper.write(Type.OPTIONAL_COMPONENT, displayName);
-                        } else if (action == 1 || action == 2) { // Update gamemode/update latency
-                            wrapper.passthrough(Type.VAR_INT);
-                        } else if (action == 3) { // Update display name
-                            final JsonElement displayName = wrapper.passthrough(Type.BOOLEAN) ? wrapper.read(Type.COMPONENT) : null;
-                            wrapper.write(Type.OPTIONAL_COMPONENT, displayName);
-                        }
-                    }
-                });
-            }
-        });
        registerClientbound(ClientboundPackets1_19_1.SERVER_DATA, new PacketRemapper() {
            @Override
            public void registerMap() {
@ -215,16 +150,6 @@ public final class Protocol1_19_3To1_19_1 extends AbstractProtocol<ClientboundPa
                handler(wrapper -> {
                    final PlayerMessageSignature signature = wrapper.read(Type.PLAYER_MESSAGE_SIGNATURE);

-                    final String plainText = wrapper.read(Type.STRING);
-                    JsonElement component = wrapper.read(Type.OPTIONAL_COMPONENT);
-                    final JsonElement unsignedComponent = wrapper.read(Type.OPTIONAL_COMPONENT);
-                    if (unsignedComponent != null) {
-                        component = unsignedComponent;
-                    }
-                    if (component == null) {
-                        component = GsonComponentSerializer.gson().serializeToTree(Component.text(plainText));
-                    }
-
                    // Store message signature for last seen
                    if (!signature.uuid().equals(ZERO_UUID) && signature.signatureBytes().length != 0) {
                        final ReceivedMessagesStorage messagesStorage = wrapper.user().get(ReceivedMessagesStorage.class);
@ -240,16 +165,27 @@ public final class Protocol1_19_3To1_19_1 extends AbstractProtocol<ClientboundPa
                        }
                    }

+                    final String plainMessage = wrapper.read(Type.STRING);
+                    JsonElement decoratedMessage = wrapper.read(Type.OPTIONAL_COMPONENT);

                    wrapper.read(Type.LONG); // Timestamp
                    wrapper.read(Type.LONG); // Salt
                    wrapper.read(Type.PLAYER_MESSAGE_SIGNATURE_ARRAY); // Last seen
+
+                    final JsonElement unsignedMessage = wrapper.read(Type.OPTIONAL_COMPONENT);
+                    if (unsignedMessage != null) {
+                        decoratedMessage = unsignedMessage;
+                    }
+                    if (decoratedMessage == null) {
+                        decoratedMessage = GsonComponentSerializer.gson().serializeToTree(Component.text(plainMessage));
+                    }
+
                    final int filterMaskType = wrapper.read(Type.VAR_INT);
                    if (filterMaskType == 2) { // Partially filtered
                        wrapper.read(Type.LONG_ARRAY_PRIMITIVE); // Mask
                    }

-                    wrapper.write(Type.COMPONENT, component);
+                    wrapper.write(Type.COMPONENT, decoratedMessage);
                    // Keep chat type at the end
                });
            }
@ -262,11 +198,11 @@ public final class Protocol1_19_3To1_19_1 extends AbstractProtocol<ClientboundPa
                map(Type.LONG); // Timestamp
                map(Type.LONG); // Salt
                handler(wrapper -> {
-                    final int signatures = wrapper.passthrough(Type.VAR_INT);
+                    final int signatures = wrapper.read(Type.VAR_INT);
+                    wrapper.write(Type.VAR_INT, 0);
                    for (int i = 0; i < signatures; i++) {
-                        wrapper.passthrough(Type.STRING); // Argument name
-                        final byte[] signature = wrapper.read(MESSAGE_SIGNATURE_BYTES_TYPE);
-                        wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, signature);
+                        wrapper.read(Type.STRING); // Argument name
+                        wrapper.read(OPTIONAL_MESSAGE_SIGNATURE_BYTES_TYPE); // Signature
                    }

                    wrapper.write(Type.BOOLEAN, false); // No signed preview
@ -285,10 +221,13 @@ public final class Protocol1_19_3To1_19_1 extends AbstractProtocol<ClientboundPa
            public void registerMap() {
                map(Type.STRING); // Command
                map(Type.LONG); // Timestamp
-                map(Type.LONG); // Salt
+                // Salt
+                read(Type.LONG);
+                create(Type.LONG, 0L);
                handler(wrapper -> {
-                    final byte[] signature = wrapper.read(Type.BOOLEAN) ? wrapper.read(MESSAGE_SIGNATURE_BYTES_TYPE) : null;
-                    wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, signature != null ? signature : EMPTY_BYTES);
+                    // Remove signature
+                    final byte[] signature = wrapper.read(OPTIONAL_MESSAGE_SIGNATURE_BYTES_TYPE);
+                    wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, EMPTY_BYTES);
                    wrapper.write(Type.BOOLEAN, false); // No signed preview

                    final ReceivedMessagesStorage messagesStorage = wrapper.user().get(ReceivedMessagesStorage.class);
@ -301,11 +240,53 @@ public final class Protocol1_19_3To1_19_1 extends AbstractProtocol<ClientboundPa
            }
        });

+        // Remove the key once again
        registerServerbound(State.LOGIN, ServerboundLoginPackets.HELLO.getId(), ServerboundLoginPackets.HELLO.getId(), new PacketRemapper() {
            @Override
            public void registerMap() {
                map(Type.STRING); // Name
                read(Type.UUID); // Session UUID
+                handler(wrapper -> {
+                    final ProfileKey profileKey = wrapper.read(Type.OPTIONAL_PROFILE_KEY);
+                    wrapper.write(Type.OPTIONAL_PROFILE_KEY, null);
+                    if (profileKey == null) {
+                        wrapper.user().put(new NonceStorage(null));
+                    }
+                });
+            }
+        });
+        registerClientbound(State.LOGIN, ClientboundLoginPackets.HELLO.getId(), ClientboundLoginPackets.HELLO.getId(), new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.STRING); // Server id
+                handler(wrapper -> {
+                    if (wrapper.user().has(NonceStorage.class)) {
+                        return;
+                    }
+                    final byte[] publicKey = wrapper.passthrough(Type.BYTE_ARRAY_PRIMITIVE);
+                    final byte[] nonce = wrapper.passthrough(Type.BYTE_ARRAY_PRIMITIVE);
+                    wrapper.user().put(new NonceStorage(CipherUtil.encryptNonce(publicKey, nonce)));
+                });
+            }
+        });
+        registerServerbound(State.LOGIN, ServerboundLoginPackets.ENCRYPTION_KEY.getId(), ServerboundLoginPackets.ENCRYPTION_KEY.getId(), new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.BYTE_ARRAY_PRIMITIVE); // Keys
+                handler(wrapper -> {
+                    final NonceStorage nonceStorage = wrapper.user().remove(NonceStorage.class);
+                    if (nonceStorage.nonce() == null) {
+                        return;
+                    }
+
+                    final boolean isNonce = wrapper.read(Type.BOOLEAN);
+                    wrapper.write(Type.BOOLEAN, true);
+                    if (!isNonce) { // Should never be true at this point, but /shrug otherwise
+                        wrapper.read(Type.LONG); // Salt
+                        wrapper.read(Type.BYTE_ARRAY_PRIMITIVE); // Signature
+                        wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, nonceStorage.nonce());
+                    }
+                });
            }
        });

@ -334,6 +315,7 @@ public final class Protocol1_19_3To1_19_1 extends AbstractProtocol<ClientboundPa

    @Override
    public void init(final UserConnection user) {
+        user.put(new ReceivedMessagesStorage());
        addEntityTracker(user, new EntityTrackerBase(user, Entity1_19_3Types.PLAYER));
    }

--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/ServerboundPackets1_19_3.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/ServerboundPackets1_19_3.java
@ -27,50 +27,50 @@ public enum ServerboundPackets1_19_3 implements ServerboundPacketType {
    CHAT_ACK, // 0x03
    CHAT_COMMAND, // 0x04
    CHAT_MESSAGE, // 0x05
-    CLIENT_STATUS, // 0x07
-    CLIENT_SETTINGS, // 0x08
-    TAB_COMPLETE, // 0x09
-    CLICK_WINDOW_BUTTON, // 0x0A
-    CLICK_WINDOW, // 0x0B
-    CLOSE_WINDOW, // 0x0C
-    PLUGIN_MESSAGE, // 0x0D
-    EDIT_BOOK, // 0x0E
-    ENTITY_NBT_REQUEST, // 0x0F
-    INTERACT_ENTITY, // 0x10
-    GENERATE_JIGSAW, // 0x11
-    KEEP_ALIVE, // 0x12
-    LOCK_DIFFICULTY, // 0x13
-    PLAYER_POSITION, // 0x14
-    PLAYER_POSITION_AND_ROTATION, // 0x15
-    PLAYER_ROTATION, // 0x16
-    PLAYER_MOVEMENT, // 0x17
-    VEHICLE_MOVE, // 0x18
-    STEER_BOAT, // 0x19
-    PICK_ITEM, // 0x1A
-    CRAFT_RECIPE_REQUEST, // 0x1B
-    PLAYER_ABILITIES, // 0x1C
-    PLAYER_DIGGING, // 0x1D
-    ENTITY_ACTION, // 0x1E
-    STEER_VEHICLE, // 0x1F
-    PONG, // 0x20
-    RECIPE_BOOK_DATA, // 0x21
-    SEEN_RECIPE, // 0x22
-    RENAME_ITEM, // 0x23
-    RESOURCE_PACK_STATUS, // 0x24
-    ADVANCEMENT_TAB, // 0x25
-    SELECT_TRADE, // 0x26
-    SET_BEACON_EFFECT, // 0x27
-    HELD_ITEM_CHANGE, // 0x28
-    UPDATE_COMMAND_BLOCK, // 0x29
-    UPDATE_COMMAND_BLOCK_MINECART, // 0x2A
-    CREATIVE_INVENTORY_ACTION, // 0x2B
-    UPDATE_JIGSAW_BLOCK, // 0x2C
-    UPDATE_STRUCTURE_BLOCK, // 0x2D
-    UPDATE_SIGN, // 0x2E
-    ANIMATION, // 0x2F
-    SPECTATE, // 0x30
-    PLAYER_BLOCK_PLACEMENT, // 0x31
-    USE_ITEM; // 0x32
+    CLIENT_STATUS, // 0x06
+    CLIENT_SETTINGS, // 0x07
+    TAB_COMPLETE, // 0x08
+    CLICK_WINDOW_BUTTON, // 0x09
+    CLICK_WINDOW, // 0x0A
+    CLOSE_WINDOW, // 0x0B
+    PLUGIN_MESSAGE, // 0x0C
+    EDIT_BOOK, // 0x0D
+    ENTITY_NBT_REQUEST, // 0x0E
+    INTERACT_ENTITY, // 0x0F
+    GENERATE_JIGSAW, // 0x10
+    KEEP_ALIVE, // 0x11
+    LOCK_DIFFICULTY, // 0x12
+    PLAYER_POSITION, // 0x13
+    PLAYER_POSITION_AND_ROTATION, // 0x14
+    PLAYER_ROTATION, // 0x15
+    PLAYER_MOVEMENT, // 0x16
+    VEHICLE_MOVE, // 0x17
+    STEER_BOAT, // 0x18
+    PICK_ITEM, // 0x19
+    CRAFT_RECIPE_REQUEST, // 0x1A
+    PLAYER_ABILITIES, // 0x1B
+    PLAYER_DIGGING, // 0x1C
+    ENTITY_ACTION, // 0x1D
+    STEER_VEHICLE, // 0x1E
+    PONG, // 0x1F
+    RECIPE_BOOK_DATA, // 0x20
+    SEEN_RECIPE, // 0x21
+    RENAME_ITEM, // 0x22
+    RESOURCE_PACK_STATUS, // 0x23
+    ADVANCEMENT_TAB, // 0x24
+    SELECT_TRADE, // 0x25
+    SET_BEACON_EFFECT, // 0x26
+    HELD_ITEM_CHANGE, // 0x27
+    UPDATE_COMMAND_BLOCK, // 0x28
+    UPDATE_COMMAND_BLOCK_MINECART, // 0x29
+    CREATIVE_INVENTORY_ACTION, // 0x2A
+    UPDATE_JIGSAW_BLOCK, // 0x2B
+    UPDATE_STRUCTURE_BLOCK, // 0x2C
+    UPDATE_SIGN, // 0x2D
+    ANIMATION, // 0x2E
+    SPECTATE, // 0x2F
+    PLAYER_BLOCK_PLACEMENT, // 0x30
+    USE_ITEM; // 0x31

    @Override
    public int getId() {
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/packets/EntityPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/packets/EntityPackets.java
@ -17,18 +17,28 @@
 */
 package com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.packets;

+import com.google.gson.JsonElement;
+import com.viaversion.viaversion.api.minecraft.ProfileKey;
 import com.viaversion.viaversion.api.minecraft.entities.Entity1_19_3Types;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.types.BitSetType;
 import com.viaversion.viaversion.api.type.types.version.Types1_19;
 import com.viaversion.viaversion.api.type.types.version.Types1_19_3;
 import com.viaversion.viaversion.protocols.protocol1_19_1to1_19.ClientboundPackets1_19_1;
+import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.ClientboundPackets1_19_3;
 import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.Protocol1_19_3To1_19_1;
 import com.viaversion.viaversion.rewriter.EntityRewriter;

+import java.util.BitSet;
+import java.util.UUID;
+
 public final class EntityPackets extends EntityRewriter<Protocol1_19_3To1_19_1> {

+    private static final BitSetType PROFILE_ACTIONS_ENUM_TYPE = new BitSetType(6);
+
    public EntityPackets(final Protocol1_19_3To1_19_1 protocol) {
        super(protocol);
    }
@ -53,6 +63,13 @@ public final class EntityPackets extends EntityRewriter<Protocol1_19_3To1_19_1>
                handler(dimensionDataHandler());
                handler(biomeSizeTracker());
                handler(worldDataTrackerHandlerByKey());
+                handler(wrapper -> {
+                    // Also enable vanilla features
+                    final PacketWrapper enableFeaturesPacket = wrapper.create(ClientboundPackets1_19_3.UPDATE_ENABLED_FEATURES);
+                    enableFeaturesPacket.write(Type.VAR_INT, 1);
+                    enableFeaturesPacket.write(Type.STRING, "minecraft:vanilla");
+                    enableFeaturesPacket.send(Protocol1_19_3To1_19_1.class);
+                });
            }
        });

@ -64,6 +81,72 @@ public final class EntityPackets extends EntityRewriter<Protocol1_19_3To1_19_1>
                handler(worldDataTrackerHandlerByKey());
            }
        });
+
+        protocol.registerClientbound(ClientboundPackets1_19_1.PLAYER_INFO, ClientboundPackets1_19_3.PLAYER_INFO_UPDATE, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                handler(wrapper -> {
+                    final int action = wrapper.read(Type.VAR_INT);
+                    if (action == 4) { // Remove player
+                        // Write into new packet type
+                        final int entries = wrapper.read(Type.VAR_INT);
+                        final UUID[] uuidsToRemove = new UUID[entries];
+                        for (int i = 0; i < entries; i++) {
+                            uuidsToRemove[i] = wrapper.read(Type.UUID);
+                        }
+                        wrapper.write(Type.UUID_ARRAY, uuidsToRemove);
+                        wrapper.setPacketType(ClientboundPackets1_19_3.PLAYER_INFO_REMOVE);
+                        return;
+                    }
+
+                    final BitSet set = new BitSet(6);
+                    if (action == 0) {
+                        // Includes add player, profile key, gamemode, listed status, latency, and display name
+                        set.set(0, 6);
+                    } else {
+                        // Update listed added at 3, initialize chat added at index 1
+                        set.set(action == 1 ? action + 1 : action + 2);
+                    }
+
+                    wrapper.write(PROFILE_ACTIONS_ENUM_TYPE, set);
+                    final int entries = wrapper.passthrough(Type.VAR_INT);
+                    for (int i = 0; i < entries; i++) {
+                        wrapper.passthrough(Type.UUID); // UUID
+                        if (action == 0) { // Add player
+                            wrapper.passthrough(Type.STRING); // Player Name
+
+                            final int properties = wrapper.passthrough(Type.VAR_INT);
+                            for (int j = 0; j < properties; j++) {
+                                wrapper.passthrough(Type.STRING); // Name
+                                wrapper.passthrough(Type.STRING); // Value
+                                if (wrapper.passthrough(Type.BOOLEAN)) {
+                                    wrapper.passthrough(Type.STRING); // Signature
+                                }
+                            }
+
+                            final int gamemode = wrapper.read(Type.VAR_INT);
+                            final int ping = wrapper.read(Type.VAR_INT);
+                            final JsonElement displayName = wrapper.read(Type.BOOLEAN) ? wrapper.read(Type.COMPONENT) : null;
+                            final ProfileKey profileKey = wrapper.read(Type.OPTIONAL_PROFILE_KEY);
+
+                            // Salvage signed chat
+                            wrapper.write(Type.UUID, UUID.randomUUID());
+                            wrapper.write(Type.OPTIONAL_PROFILE_KEY, profileKey);
+
+                            wrapper.write(Type.VAR_INT, gamemode);
+                            wrapper.write(Type.BOOLEAN, true); // Also update listed
+                            wrapper.write(Type.VAR_INT, ping);
+                            wrapper.write(Type.OPTIONAL_COMPONENT, displayName);
+                        } else if (action == 1 || action == 2) { // Update gamemode/update latency
+                            wrapper.passthrough(Type.VAR_INT);
+                        } else if (action == 3) { // Update display name
+                            final JsonElement displayName = wrapper.passthrough(Type.BOOLEAN) ? wrapper.read(Type.COMPONENT) : null;
+                            wrapper.write(Type.OPTIONAL_COMPONENT, displayName);
+                        }
+                    }
+                });
+            }
+        });
    }

    @Override
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/packets/InventoryPackets.java
@ -18,13 +18,11 @@
 package com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.packets;

 import com.viaversion.viaversion.api.minecraft.item.Item;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.data.RecipeRewriter1_16;
 import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.types.Chunk1_18Type;
 import com.viaversion.viaversion.protocols.protocol1_19_1to1_19.ClientboundPackets1_19_1;
-import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.ClientboundPackets1_19_3;
 import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.Protocol1_19_3To1_19_1;
 import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.ServerboundPackets1_19_3;
 import com.viaversion.viaversion.rewriter.BlockRewriter;
@ -64,12 +62,6 @@ public final class InventoryPackets extends ItemRewriter<Protocol1_19_3To1_19_1>
            @Override
            public void registerMap() {
                handler(wrapper -> {
-                    // Also enable vanilla features
-                    final PacketWrapper enableFeaturesPacket = wrapper.create(ClientboundPackets1_19_3.UPDATE_ENABLED_FEATURES);
-                    enableFeaturesPacket.write(Type.VAR_INT, 1);
-                    enableFeaturesPacket.write(Type.STRING, "minecraft:vanilla");
-                    enableFeaturesPacket.send(Protocol1_19_3To1_19_1.class);
-
                    final int size = wrapper.passthrough(Type.VAR_INT);
                    for (int i = 0; i < size; i++) {
                        final String type = wrapper.passthrough(Type.STRING).replace("minecraft:", "");
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/storage/NonceStorage.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/storage/NonceStorage.java
@ -0,0 +1,34 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2022 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.storage;
+
+import com.viaversion.viaversion.api.connection.StorableObject;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public final class NonceStorage implements StorableObject {
+
+    private final byte[] nonce;
+
+    public NonceStorage(final byte @Nullable[] nonce) {
+        this.nonce = nonce;
+    }
+
+    public byte @Nullable [] nonce() {
+        return nonce;
+    }
+}