specprotocol 1.4.3 → 1.4.5

package/dist/bot.js

@@ -27,11 +27,13 @@ const encryption_js_1 = require("./protocol/encryption.js");
 const handshake_js_1 = require("./protocol/states/handshake.js");
 const login_js_1 = require("./protocol/states/login.js");
 const play_js_1 = require("./protocol/states/play.js");
+const version_js_1 = require("./protocol/version.js");
 // World & Entity
 const world_js_1 = require("./world/world.js");
 const entity_js_1 = require("./entity/entity.js");
 // Core modules
 const tablist_js_1 = require("./tablist.js");
+const chat_js_1 = require("./chat.js");
 const inventory_js_1 = require("./inventory.js");
 const scoreboard_js_1 = require("./scoreboard.js");
 const bossbar_js_1 = require("./bossbar.js");
@@ -39,8 +41,9 @@ const weather_js_1 = require("./weather.js");
 const block_finder_js_1 = require("./block-finder.js");
 // Plugins
 const plugin_manager_js_1 = require("./plugins/plugin-manager.js");
-const chat_js_1 = require("./plugins/built-in/chat.js");
+const chat_js_2 = require("./plugins/built-in/chat.js");
 const combat_js_1 = require("./plugins/built-in/combat.js");
+const MISSING_PACKET_ID = -1;
 // ─── Bot Class ──────────────────────────────────────────
 class Bot extends events_js_1.TypedEventEmitter {
     // Connection
@@ -84,19 +87,130 @@ class Bot extends events_js_1.TypedEventEmitter {
     weather;
     // Config
     options;
+    protocolInfo;
+    loginClientIds;
+    loginServerIds;
+    configurationClientIds;
+    configurationServerIds;
+    playClientIds;
+    playServerIds;
     // Packet handlers for play state
     packetHandlers = new Map();
+    playPacketListener = null;
+    onConnectionError = (err) => {
+        this.emit('error', err);
+    };
+    onConnectionClose = () => {
+        this.stopPhysicsTick();
+        this.emit('end');
+    };
     constructor(options) {
         super();
+        this.protocolInfo = (0, version_js_1.resolveProtocolInfo)(options.version ?? handshake_js_1.PROTOCOL_VERSION);
         this.options = {
             host: options.host,
             port: options.port ?? 25565,
-            version: options.version ?? handshake_js_1.PROTOCOL_VERSION,
+            version: this.protocolInfo.protocolVersion,
             viewDistance: options.viewDistance ?? 10,
         };
         this.authMode = options.auth ?? 'offline';
         this._username = options.username;
         this.logger = new logger_js_1.Logger('Bot', options.logLevel ?? logger_js_1.LogLevel.INFO);
+        this.logger.info(`Using protocol ${this.protocolInfo.protocolVersion} (${this.protocolInfo.minecraftVersion})`);
+        const missing = MISSING_PACKET_ID;
+        const loginToClient = this.protocolInfo.packetMappings.login.toClient;
+        const loginToServer = this.protocolInfo.packetMappings.login.toServer;
+        const configToClient = this.protocolInfo.packetMappings.configuration?.toClient ?? {};
+        const configToServer = this.protocolInfo.packetMappings.configuration?.toServer ?? {};
+        const playToClient = this.protocolInfo.packetMappings.play.toClient;
+        const playToServer = this.protocolInfo.packetMappings.play.toServer;
+        this.loginClientIds = {
+            disconnect: (0, version_js_1.resolvePacketId)(loginToClient, ['disconnect']) ?? missing,
+            encryptionBegin: (0, version_js_1.resolvePacketId)(loginToClient, ['encryption_begin']) ?? missing,
+            success: (0, version_js_1.resolvePacketId)(loginToClient, ['success']) ?? missing,
+            compress: (0, version_js_1.resolvePacketId)(loginToClient, ['compress']) ?? missing,
+            loginPluginRequest: (0, version_js_1.resolvePacketId)(loginToClient, ['login_plugin_request']) ?? missing,
+        };
+        this.loginServerIds = {
+            loginStart: (0, version_js_1.resolvePacketId)(loginToServer, ['login_start']) ?? missing,
+            encryptionBegin: (0, version_js_1.resolvePacketId)(loginToServer, ['encryption_begin']) ?? missing,
+            loginPluginResponse: (0, version_js_1.resolvePacketId)(loginToServer, ['login_plugin_response']) ?? missing,
+            loginAcknowledged: (0, version_js_1.resolvePacketId)(loginToServer, ['login_acknowledged']) ?? missing,
+        };
+        this.configurationClientIds = {
+            disconnect: (0, version_js_1.resolvePacketId)(configToClient, ['disconnect']) ?? missing,
+            finishConfiguration: (0, version_js_1.resolvePacketId)(configToClient, ['finish_configuration']) ?? missing,
+            keepAlive: (0, version_js_1.resolvePacketId)(configToClient, ['keep_alive']) ?? missing,
+            ping: (0, version_js_1.resolvePacketId)(configToClient, ['ping']) ?? missing,
+            customPayload: (0, version_js_1.resolvePacketId)(configToClient, ['custom_payload']) ?? missing,
+            registryData: (0, version_js_1.resolvePacketId)(configToClient, ['registry_data']) ?? missing,
+            featureFlags: (0, version_js_1.resolvePacketId)(configToClient, ['feature_flags']) ?? missing,
+            tags: (0, version_js_1.resolvePacketId)(configToClient, ['tags']) ?? missing,
+            selectKnownPacks: (0, version_js_1.resolvePacketId)(configToClient, ['select_known_packs']) ?? missing,
+            cookieRequest: (0, version_js_1.resolvePacketId)(configToClient, ['cookie_request']) ?? missing,
+            addResourcePack: (0, version_js_1.resolvePacketId)(configToClient, ['add_resource_pack', 'resource_pack_send']) ?? missing,
+            serverLinks: (0, version_js_1.resolvePacketId)(configToClient, ['server_links']) ?? missing,
+        };
+        this.configurationServerIds = {
+            finishConfiguration: (0, version_js_1.resolvePacketId)(configToServer, ['finish_configuration']) ?? missing,
+            keepAlive: (0, version_js_1.resolvePacketId)(configToServer, ['keep_alive']) ?? missing,
+            pong: (0, version_js_1.resolvePacketId)(configToServer, ['pong']) ?? missing,
+            selectKnownPacks: (0, version_js_1.resolvePacketId)(configToServer, ['select_known_packs']) ?? missing,
+        };
+        this.playClientIds = {
+            keepAlive: (0, version_js_1.resolvePacketId)(playToClient, ['keep_alive']) ?? missing,
+            chunkBatchFinished: (0, version_js_1.resolvePacketId)(playToClient, ['chunk_batch_finished']) ?? missing,
+            login: (0, version_js_1.resolvePacketId)(playToClient, ['login']) ?? missing,
+            position: (0, version_js_1.resolvePacketId)(playToClient, ['position']) ?? missing,
+            updateHealth: (0, version_js_1.resolvePacketId)(playToClient, ['update_health']) ?? missing,
+            blockChange: (0, version_js_1.resolvePacketId)(playToClient, ['block_change']) ?? missing,
+            bossBar: (0, version_js_1.resolvePacketId)(playToClient, ['boss_bar']) ?? missing,
+            spawnEntity: (0, version_js_1.resolvePacketId)(playToClient, ['spawn_entity']) ?? missing,
+            entityDestroy: (0, version_js_1.resolvePacketId)(playToClient, ['entity_destroy']) ?? missing,
+            relEntityMove: (0, version_js_1.resolvePacketId)(playToClient, ['rel_entity_move']) ?? missing,
+            entityMoveLook: (0, version_js_1.resolvePacketId)(playToClient, ['entity_move_look']) ?? missing,
+            entityVelocity: (0, version_js_1.resolvePacketId)(playToClient, ['entity_velocity']) ?? missing,
+            entityHeadRotation: (0, version_js_1.resolvePacketId)(playToClient, ['entity_head_rotation']) ?? missing,
+            gameStateChange: (0, version_js_1.resolvePacketId)(playToClient, ['game_state_change']) ?? missing,
+            respawn: (0, version_js_1.resolvePacketId)(playToClient, ['respawn']) ?? missing,
+            experience: (0, version_js_1.resolvePacketId)(playToClient, ['experience']) ?? missing,
+            updateTime: (0, version_js_1.resolvePacketId)(playToClient, ['update_time']) ?? missing,
+            spawnPosition: (0, version_js_1.resolvePacketId)(playToClient, ['spawn_position']) ?? missing,
+            openWindow: (0, version_js_1.resolvePacketId)(playToClient, ['open_window']) ?? missing,
+            windowItems: (0, version_js_1.resolvePacketId)(playToClient, ['window_items']) ?? missing,
+            setSlot: (0, version_js_1.resolvePacketId)(playToClient, ['set_slot']) ?? missing,
+            closeWindow: (0, version_js_1.resolvePacketId)(playToClient, ['close_window']) ?? missing,
+            ping: (0, version_js_1.resolvePacketId)(playToClient, ['ping']) ?? missing,
+            acknowledgePlayerDigging: (0, version_js_1.resolvePacketId)(playToClient, ['acknowledge_player_digging']) ?? missing,
+            disconnect: (0, version_js_1.resolvePacketId)(playToClient, ['kick_disconnect']) ?? missing,
+            abilities: (0, version_js_1.resolvePacketId)(playToClient, ['abilities']) ?? missing,
+            systemChat: (0, version_js_1.resolvePacketId)(playToClient, ['system_chat']) ?? missing,
+            profilelessChat: (0, version_js_1.resolvePacketId)(playToClient, ['profileless_chat']) ?? missing,
+            legacyChat: (0, version_js_1.resolvePacketId)(playToClient, ['chat']) ?? missing,
+        };
+        this.playServerIds = {
+            keepAlive: (0, version_js_1.resolvePacketId)(playToServer, ['keep_alive']) ?? missing,
+            chunkBatchReceived: (0, version_js_1.resolvePacketId)(playToServer, ['chunk_batch_received']) ?? missing,
+            teleportConfirm: (0, version_js_1.resolvePacketId)(playToServer, ['teleport_confirm']) ?? missing,
+            position: (0, version_js_1.resolvePacketId)(playToServer, ['position']) ?? missing,
+            positionLook: (0, version_js_1.resolvePacketId)(playToServer, ['position_look']) ?? missing,
+            look: (0, version_js_1.resolvePacketId)(playToServer, ['look']) ?? missing,
+            flying: (0, version_js_1.resolvePacketId)(playToServer, ['flying']) ?? missing,
+            chat: (0, version_js_1.resolvePacketId)(playToServer, ['chat']) ?? missing,
+            chatMessage: (0, version_js_1.resolvePacketId)(playToServer, ['chat_message']) ?? missing,
+            chatCommand: (0, version_js_1.resolvePacketId)(playToServer, ['chat_command']) ?? missing,
+            useEntity: (0, version_js_1.resolvePacketId)(playToServer, ['use_entity']) ?? missing,
+            armAnimation: (0, version_js_1.resolvePacketId)(playToServer, ['arm_animation']) ?? missing,
+            entityAction: (0, version_js_1.resolvePacketId)(playToServer, ['entity_action']) ?? missing,
+            blockDig: (0, version_js_1.resolvePacketId)(playToServer, ['block_dig']) ?? missing,
+            blockPlace: (0, version_js_1.resolvePacketId)(playToServer, ['block_place']) ?? missing,
+            useItem: (0, version_js_1.resolvePacketId)(playToServer, ['use_item']) ?? missing,
+            heldItemSlot: (0, version_js_1.resolvePacketId)(playToServer, ['held_item_slot']) ?? missing,
+            abilities: (0, version_js_1.resolvePacketId)(playToServer, ['abilities']) ?? missing,
+            clientCommand: (0, version_js_1.resolvePacketId)(playToServer, ['client_command']) ?? missing,
+            closeWindow: (0, version_js_1.resolvePacketId)(playToServer, ['close_window']) ?? missing,
+            pong: (0, version_js_1.resolvePacketId)(playToServer, ['pong']) ?? missing,
+        };
         // Initialize subsystems
         this.world = new world_js_1.World();
         this.entities = new entity_js_1.EntityManager();
@@ -118,8 +232,10 @@ class Bot extends events_js_1.TypedEventEmitter {
             port: this.options.port,
             logLevel: options.logLevel,
         });
+        this.connection.on('error', this.onConnectionError);
+        this.connection.on('close', this.onConnectionClose);
         // Register built-in plugins (deferred init)
-        this.plugins.register(new chat_js_1.ChatPlugin());
+        this.plugins.register(new chat_js_2.ChatPlugin());
         this.plugins.register(new combat_js_1.CombatPlugin());
         // Register user plugins
         if (options.plugins) {
@@ -140,15 +256,29 @@ class Bot extends events_js_1.TypedEventEmitter {
     get gameMode() { return this._gameMode; }
     get isAlive() { return this._isAlive; }
     get position() { return this.entity.position; }
+    requirePacketId(packetId, packetName) {
+        if (packetId === MISSING_PACKET_ID) {
+            throw new Error(`Packet '${packetName}' is unavailable for protocol ${this.options.version} (${this.protocolInfo.minecraftVersion})`);
+        }
+        return packetId;
+    }
+    sendPlayPacket(packetId, data, packetName) {
+        this.connection.sendPacket(this.requirePacketId(packetId, packetName), data);
+    }
+    emitChatFromComponent(rawContent, isOverlay) {
+        const message = chat_js_1.ChatMessage.parse(rawContent);
+        this.emit('chatMessage', message, isOverlay);
+        this.emit('chat', message.toString(), isOverlay);
+    }
     // ─── Connect & Login ────────────────────────────────
     /**
      * Connect to the server and begin the login process.
      */
     async connect() {
         this.logger.info(`Connecting to ${this.options.host}:${this.options.port}...`);
-        // Setup error/close handling
-        this.connection.on('error', (err) => this.emit('error', err));
-        this.connection.on('close', () => this.emit('end'));
+        if (this.connection.connected) {
+            throw new Error('Bot is already connected');
+        }
         // Connect TCP
         await this.connection.connect();
         this.emit('connect');
@@ -180,80 +310,105 @@ class Bot extends events_js_1.TypedEventEmitter {
         }
         // Step 3: Send Login Start
         this.logger.info(`Logging in as ${this._username} (${uuid})...`);
-        this.connection.sendPacket(login_js_1.LoginServerboundPackets.LOGIN_START, (0, login_js_1.buildLoginStartPacket)(this._username, uuid));
+        this.connection.sendPacket(this.requirePacketId(this.loginServerIds.loginStart, 'login_start'), (0, login_js_1.buildLoginStartPacket)(this._username, uuid, this.options.version));
         // Step 4: Handle login response packets
         await this.handleLoginSequence();
     }
     async handleLoginSequence() {
         return new Promise((resolve, reject) => {
+            let settled = false;
+            const finish = (fn) => {
+                if (settled)
+                    return;
+                settled = true;
+                clearTimeout(timeout);
+                this.connection.off('packet', onPacket);
+                this.connection.off('close', onClose);
+                this.connection.off('error', onError);
+                fn();
+            };
             const timeout = setTimeout(() => {
-                reject(new Error('Login timeout (30s)'));
+                finish(() => reject(new Error('Login timeout (30s)')));
             }, 30000);
+            const onClose = () => {
+                finish(() => reject(new Error('Connection closed during login')));
+            };
+            const onError = (err) => {
+                finish(() => reject(err));
+            };
             const onPacket = (packet) => {
-                try {
-                    this.handleLoginPacket(packet, () => {
-                        clearTimeout(timeout);
-                        // Remove login handler IMMEDIATELY before entering config state
-                        this.connection.off('packet', onPacket);
-                        resolve();
-                    });
-                }
-                catch (err) {
-                    clearTimeout(timeout);
-                    this.connection.off('packet', onPacket);
-                    reject(err);
-                }
+                this.handleLoginPacket(packet, () => {
+                    finish(resolve);
+                }).catch((err) => {
+                    const error = err instanceof Error ? err : new Error(String(err));
+                    finish(() => reject(error));
+                });
             };
             this.connection.on('packet', onPacket);
+            this.connection.on('close', onClose);
+            this.connection.on('error', onError);
         });
     }
-    handleLoginPacket(packet, onComplete) {
+    async handleLoginPacket(packet, onComplete) {
         switch (packet.id) {
-            case login_js_1.LoginClientboundPackets.ENCRYPTION_REQUEST: {
-                this.handleEncryptionRequest(packet.data);
+            case this.loginClientIds.encryptionBegin: {
+                await this.handleEncryptionRequest(packet.data);
                 break;
             }
-            case login_js_1.LoginClientboundPackets.SET_COMPRESSION: {
+            case this.loginClientIds.compress: {
                 const { threshold } = (0, login_js_1.parseSetCompressionPacket)(packet.data);
                 this.connection.enableCompression(threshold);
                 this.logger.info(`Compression enabled (threshold: ${threshold})`);
                 break;
             }
-            case login_js_1.LoginClientboundPackets.LOGIN_SUCCESS: {
-                const success = (0, login_js_1.parseLoginSuccessPacket)(packet.data);
+            case this.loginClientIds.success: {
+                const success = (0, login_js_1.parseLoginSuccessPacket)(packet.data, this.options.version);
                 this._username = success.username;
                 this._uuid = success.uuid;
                 this.logger.info(`Login successful! ${success.username} (${success.uuid})`);
                 // Send Login Acknowledged
-                this.connection.sendPacket(login_js_1.LoginServerboundPackets.LOGIN_ACKNOWLEDGED, (0, login_js_1.buildLoginAcknowledgedPacket)());
+                if (this.loginServerIds.loginAcknowledged !== MISSING_PACKET_ID) {
+                    this.connection.sendPacket(this.loginServerIds.loginAcknowledged, (0, login_js_1.buildLoginAcknowledgedPacket)());
+                }
                 // Remove login handler FIRST, then enter Configuration state
                 onComplete();
                 // Enter Configuration state — handle config packets before Play
-                this.handleConfigurationState().then(() => {
+                if (this.protocolInfo.supportsConfigurationState) {
+                    this.handleConfigurationState().then(() => {
+                        this.setupPlayStateHandlers();
+                        this.emit('login');
+                    }).catch((err) => {
+                        this.logger.error('Configuration state failed:', err);
+                        const error = err instanceof Error ? err : new Error(String(err));
+                        this.emit('error', error);
+                        this.disconnect();
+                    });
+                }
+                else {
                     this.setupPlayStateHandlers();
                     this.emit('login');
-                }).catch((err) => {
-                    this.logger.error('Configuration state failed:', err);
-                });
+                }
                 break;
             }
-            case login_js_1.LoginClientboundPackets.DISCONNECT: {
+            case this.loginClientIds.disconnect: {
                 const { reason } = (0, login_js_1.parseDisconnectPacket)(packet.data);
                 this.logger.error(`Disconnected during login: ${reason}`);
                 this.emit('kicked', reason);
-                break;
+                throw new Error(`Disconnected during login: ${reason}`);
             }
-            case login_js_1.LoginClientboundPackets.LOGIN_PLUGIN_REQUEST: {
+            case this.loginClientIds.loginPluginRequest: {
                 const pluginReq = (0, login_js_1.parseLoginPluginRequestPacket)(packet.data);
                 this.logger.debug(`Login plugin request: ${pluginReq.channel}`);
                 // Respond with "not understood"
-                this.connection.sendPacket(login_js_1.LoginServerboundPackets.LOGIN_PLUGIN_RESPONSE, (0, login_js_1.buildLoginPluginResponsePacket)(pluginReq.messageId));
+                if (this.loginServerIds.loginPluginResponse !== MISSING_PACKET_ID) {
+                    this.connection.sendPacket(this.loginServerIds.loginPluginResponse, (0, login_js_1.buildLoginPluginResponsePacket)(pluginReq.messageId));
+                }
                 break;
             }
         }
     }
-    handleEncryptionRequest(data) {
-        const request = (0, login_js_1.parseEncryptionRequestPacket)(data);
+    async handleEncryptionRequest(data) {
+        const request = (0, login_js_1.parseEncryptionRequestPacket)(data, this.options.version);
         this.logger.info('Handling encryption...');
         // Generate shared secret
         const sharedSecret = (0, encryption_js_1.generateSharedSecret)();
@@ -261,25 +416,15 @@ class Bot extends events_js_1.TypedEventEmitter {
         const encryptedSecret = (0, encryption_js_1.encryptRSA)(request.publicKey, sharedSecret);
         const encryptedToken = (0, encryption_js_1.encryptRSA)(request.publicKey, request.verifyToken);
         // If online mode, join session server
-        if (request.shouldAuthenticate && this.accessToken) {
+        if (request.shouldAuthenticate) {
+            if (!this.accessToken) {
+                throw new Error('Server requested online authentication but no Microsoft access token is available');
+            }
             const serverHash = (0, encryption_js_1.computeServerHash)(request.serverId, sharedSecret, request.publicKey);
-            (0, microsoft_js_1.joinServer)(this.accessToken, this._uuid, serverHash)
-                .then(() => {
-                // Send encryption response
-                this.connection.sendPacket(login_js_1.LoginServerboundPackets.ENCRYPTION_RESPONSE, (0, login_js_1.buildEncryptionResponsePacket)(encryptedSecret, encryptedToken));
-                // Enable encryption for all subsequent packets
-                this.connection.enableEncryption(sharedSecret);
-            })
-                .catch((err) => {
-                this.logger.error('Failed to join session:', err);
-                this.emit('error', err);
-            });
-        }
-        else {
-            // Offline mode or no auth needed
-            this.connection.sendPacket(login_js_1.LoginServerboundPackets.ENCRYPTION_RESPONSE, (0, login_js_1.buildEncryptionResponsePacket)(encryptedSecret, encryptedToken));
-            this.connection.enableEncryption(sharedSecret);
+            await (0, microsoft_js_1.joinServer)(this.accessToken, this._uuid, serverHash);
         }
+        this.connection.sendPacket(this.requirePacketId(this.loginServerIds.encryptionBegin, 'encryption_begin'), (0, login_js_1.buildEncryptionResponsePacket)(encryptedSecret, encryptedToken));
+        this.connection.enableEncryption(sharedSecret);
     }
     // ─── Configuration State ────────────────────────────
     /**
@@ -287,7 +432,7 @@ class Bot extends events_js_1.TypedEventEmitter {
      * In 1.20.2+, the server sends registry data, feature flags, etc. before Play.
      * When the server sends Finish Configuration (0x03), we transition to Play.
      *
-     * 1.21.4 Configuration Clientbound Packet IDs:
+     * Example configuration clientbound packet IDs (latest protocol):
      *   0x00 = Cookie Request
      *   0x01 = Plugin Message
      *   0x02 = Disconnect
@@ -303,91 +448,103 @@ class Bot extends events_js_1.TypedEventEmitter {
      */
     handleConfigurationState() {
         return new Promise((resolve, reject) => {
-            const timeout = setTimeout(() => {
+            let settled = false;
+            const finish = (fn) => {
+                if (settled)
+                    return;
+                settled = true;
+                clearTimeout(timeout);
                 this.connection.off('packet', configHandler);
-                reject(new Error('Configuration state timeout (60s)'));
+                this.connection.off('close', onClose);
+                this.connection.off('error', onError);
+                fn();
+            };
+            const timeout = setTimeout(() => {
+                finish(() => reject(new Error('Configuration state timeout (60s)')));
             }, 60000);
+            const onClose = () => {
+                finish(() => reject(new Error('Connection closed during configuration state')));
+            };
+            const onError = (err) => {
+                finish(() => reject(err));
+            };
             const configHandler = (packet) => {
                 switch (packet.id) {
-                    case 0x03: {
+                    case this.configurationClientIds.finishConfiguration: {
                         // Finish Configuration (clientbound)
                         this.logger.info('Configuration complete, entering Play state...');
-                        // Send Acknowledge Finish Configuration (serverbound 0x03)
-                        this.connection.sendPacket(0x03, Buffer.alloc(0));
-                        clearTimeout(timeout);
-                        this.connection.off('packet', configHandler);
-                        resolve();
+                        // Send Acknowledge Finish Configuration (serverbound)
+                        this.connection.sendPacket(this.requirePacketId(this.configurationServerIds.finishConfiguration, 'finish_configuration'), Buffer.alloc(0));
+                        finish(resolve);
                         break;
                     }
-                    case 0x04: {
+                    case this.configurationClientIds.keepAlive: {
                         // Keep Alive (clientbound) — must respond or get kicked
-                        const reader = new types_js_1.BufferReader(packet.data);
-                        const keepAliveId = reader.readLong();
-                        this.logger.debug(`Config: Keep alive (${keepAliveId})`);
-                        // Respond with same keep alive ID (serverbound 0x04)
-                        const kaWriter = new types_js_1.BufferWriter();
-                        kaWriter.writeLong(keepAliveId);
-                        this.connection.sendPacket(0x04, kaWriter.toBuffer());
+                        if (this.configurationServerIds.keepAlive !== MISSING_PACKET_ID) {
+                            this.connection.sendPacket(this.configurationServerIds.keepAlive, packet.data);
+                        }
                         break;
                     }
-                    case 0x01: {
+                    case this.configurationClientIds.customPayload: {
                         // Plugin Message (clientbound) — ignore
                         this.logger.debug('Config: Plugin message received');
                         break;
                     }
-                    case 0x07: {
+                    case this.configurationClientIds.registryData: {
                         // Registry Data — ignore (we don't track registry data yet)
                         this.logger.debug('Config: Registry data received');
                         break;
                     }
-                    case 0x0C: {
+                    case this.configurationClientIds.featureFlags: {
                         // Feature Flags — ignore
                         this.logger.debug('Config: Feature flags received');
                         break;
                     }
-                    case 0x0D: {
+                    case this.configurationClientIds.tags: {
                         // Update Tags — ignore
                         this.logger.debug('Config: Tags update received');
                         break;
                     }
-                    case 0x0E: {
+                    case this.configurationClientIds.selectKnownPacks: {
                         // Known Packs (clientbound) — respond with empty known packs
                         this.logger.debug('Config: Known packs request');
                         // Send Known Packs response (serverbound 0x07) — empty
                         const knownPacksWriter = new types_js_1.BufferWriter();
                         knownPacksWriter.writeVarInt(0); // 0 known packs
-                        this.connection.sendPacket(0x07, knownPacksWriter.toBuffer());
+                        if (this.configurationServerIds.selectKnownPacks !== MISSING_PACKET_ID) {
+                            this.connection.sendPacket(this.configurationServerIds.selectKnownPacks, knownPacksWriter.toBuffer());
+                        }
                         break;
                     }
-                    case 0x05: {
+                    case this.configurationClientIds.ping: {
                         // Ping — respond with pong
                         this.logger.debug('Config: Ping received');
-                        this.connection.sendPacket(0x02, packet.data); // Pong (serverbound 0x02)
+                        if (this.configurationServerIds.pong !== MISSING_PACKET_ID) {
+                            this.connection.sendPacket(this.configurationServerIds.pong, packet.data);
+                        }
                         break;
                     }
-                    case 0x00: {
+                    case this.configurationClientIds.cookieRequest: {
                         // Cookie Request — ignore
                         this.logger.debug('Config: Cookie request');
                         break;
                     }
-                    case 0x09: {
+                    case this.configurationClientIds.addResourcePack: {
                         // Add Resource Pack — respond with accepted (status 3 = accepted)
                         this.logger.debug('Config: Resource pack request');
                         break;
                     }
-                    case 0x10: {
+                    case this.configurationClientIds.serverLinks: {
                         // Server Links — ignore
                         this.logger.debug('Config: Server links received');
                         break;
                     }
-                    case 0x02: {
+                    case this.configurationClientIds.disconnect: {
                         // Disconnect
                         const reader = new types_js_1.BufferReader(packet.data);
                         const reason = reader.readString();
                         this.logger.error(`Disconnected during configuration: ${reason}`);
-                        clearTimeout(timeout);
-                        this.connection.off('packet', configHandler);
-                        reject(new Error(`Disconnected during configuration: ${reason}`));
+                        finish(() => reject(new Error(`Disconnected during configuration: ${reason}`)));
                         break;
                     }
                     default: {
@@ -397,11 +554,15 @@ class Bot extends events_js_1.TypedEventEmitter {
                 }
             };
             this.connection.on('packet', configHandler);
+            this.connection.on('close', onClose);
+            this.connection.on('error', onError);
         });
     }
     // ─── Play State ─────────────────────────────────────
     setupPlayStateHandlers() {
-        this.connection.on('packet', (packet) => {
+        if (this.playPacketListener)
+            return;
+        this.playPacketListener = (packet) => {
             this.emit('rawPacket', packet);
             this.handlePlayPacket(packet);
             // Call registered packet handlers
@@ -416,25 +577,30 @@ class Bot extends events_js_1.TypedEventEmitter {
                     }
                 }
             }
-        });
+        };
+        this.connection.on('packet', this.playPacketListener);
     }
     handlePlayPacket(packet) {
         switch (packet.id) {
-            case play_js_1.PlayClientboundPackets.KEEP_ALIVE: {
-                const { keepAliveId } = (0, play_js_1.parseKeepAlive)(packet.data);
-                this.connection.sendPacket(play_js_1.PlayServerboundPackets.KEEP_ALIVE, (0, play_js_1.buildKeepAlivePacket)(keepAliveId));
+            case this.playClientIds.keepAlive: {
+                if (this.playServerIds.keepAlive !== MISSING_PACKET_ID) {
+                    // Keep alive payload type changes by protocol; echo raw payload safely.
+                    this.connection.sendPacket(this.playServerIds.keepAlive, packet.data);
+                }
                 break;
             }
-            case play_js_1.PlayClientboundPackets.CHUNK_BATCH_FINISHED: {
+            case this.playClientIds.chunkBatchFinished: {
                 // Must respond with chunk_batch_received or server kicks
-                const writer = new types_js_1.BufferWriter();
-                writer.writeFloat(20.0); // chunks per tick
-                this.connection.sendPacket(play_js_1.PlayServerboundPackets.CHUNK_BATCH_RECEIVED, writer.toBuffer());
+                if (this.playServerIds.chunkBatchReceived !== MISSING_PACKET_ID) {
+                    const writer = new types_js_1.BufferWriter();
+                    writer.writeFloat(20.0); // chunks per tick
+                    this.connection.sendPacket(this.playServerIds.chunkBatchReceived, writer.toBuffer());
+                }
                 break;
             }
-            case play_js_1.PlayClientboundPackets.LOGIN: {
+            case this.playClientIds.login: {
                 try {
-                    const login = (0, play_js_1.parseLoginPlay)(packet.data);
+                    const login = (0, play_js_1.parseLoginPlay)(packet.data, this.options.version);
                     this._entityId = login.entityId;
                     this._gameMode = login.gameMode;
                     this.entity.id = login.entityId;
@@ -450,9 +616,9 @@ class Bot extends events_js_1.TypedEventEmitter {
                 }
                 break;
             }
-            case play_js_1.PlayClientboundPackets.PLAYER_POSITION: {
+            case this.playClientIds.position: {
                 try {
-                    const pos = (0, play_js_1.parsePlayerPosition)(packet.data);
+                    const pos = (0, play_js_1.parsePlayerPosition)(packet.data, this.options.version);
                     // Apply relative/absolute position based on flags
                     const flags = pos.flags;
                     const x = (flags & 0x01) ? this.entity.position.x + pos.x : pos.x;
@@ -462,7 +628,10 @@ class Bot extends events_js_1.TypedEventEmitter {
                     this.entity.yaw = pos.yaw;
                     this.entity.pitch = pos.pitch;
                     // Must confirm teleportation
-                    this.connection.sendPacket(play_js_1.PlayServerboundPackets.CONFIRM_TELEPORTATION, (0, play_js_1.buildConfirmTeleportationPacket)(pos.teleportId));
+                    if (this.playServerIds.teleportConfirm !== MISSING_PACKET_ID &&
+                        pos.teleportId >= 0) {
+                        this.connection.sendPacket(this.playServerIds.teleportConfirm, (0, play_js_1.buildConfirmTeleportationPacket)(pos.teleportId));
+                    }
                     this.emit('position', this.entity.position);
                 }
                 catch (err) {
@@ -470,7 +639,7 @@ class Bot extends events_js_1.TypedEventEmitter {
                 }
                 break;
             }
-            case play_js_1.PlayClientboundPackets.SET_HEALTH: {
+            case this.playClientIds.updateHealth: {
                 const { health, food, saturation } = (0, play_js_1.parseSetHealth)(packet.data);
                 this._health = health;
                 this._food = food;
@@ -491,7 +660,7 @@ class Bot extends events_js_1.TypedEventEmitter {
                 }
                 break;
             }
-            case play_js_1.PlayClientboundPackets.BLOCK_UPDATE: {
+            case this.playClientIds.blockChange: {
                 try {
                     const update = (0, play_js_1.parseBlockUpdate)(packet.data);
                     this.world.setBlock(update.x, update.y, update.z, update.blockId);
@@ -502,7 +671,17 @@ class Bot extends events_js_1.TypedEventEmitter {
                 }
                 break;
             }
-            case play_js_1.PlayClientboundPackets.SPAWN_ENTITY: {
+            case this.playClientIds.bossBar: {
+                try {
+                    const boss = (0, play_js_1.parseBossBar)(packet.data);
+                    this.bossBars.handleBossBar(boss.uuid, boss.action, boss.data);
+                }
+                catch (err) {
+                    this.logger.error('Failed to parse boss bar:', err);
+                }
+                break;
+            }
+            case this.playClientIds.spawnEntity: {
                 try {
                     const spawn = (0, play_js_1.parseSpawnEntity)(packet.data);
                     const entity = new entity_js_1.Entity(spawn.entityId, spawn.entityUUID, spawn.type, new vec3_js_1.Vec3(spawn.x, spawn.y, spawn.z));
@@ -516,7 +695,7 @@ class Bot extends events_js_1.TypedEventEmitter {
                 }
                 break;
             }
-            case play_js_1.PlayClientboundPackets.REMOVE_ENTITIES: {
+            case this.playClientIds.entityDestroy: {
                 try {
                     const { entityIds } = (0, play_js_1.parseRemoveEntities)(packet.data);
                     for (const entityId of entityIds) {
@@ -529,7 +708,7 @@ class Bot extends events_js_1.TypedEventEmitter {
                 }
                 break;
             }
-            case play_js_1.PlayClientboundPackets.ENTITY_POSITION: {
+            case this.playClientIds.relEntityMove: {
                 try {
                     const pos = (0, play_js_1.parseEntityPosition)(packet.data);
                     const entity = this.entities.get(pos.entityId);
@@ -541,7 +720,7 @@ class Bot extends events_js_1.TypedEventEmitter {
                 catch (_) { /* ignore */ }
                 break;
             }
-            case play_js_1.PlayClientboundPackets.ENTITY_POSITION_AND_ROTATION: {
+            case this.playClientIds.entityMoveLook: {
                 try {
                     const pos = (0, play_js_1.parseEntityPositionAndRotation)(packet.data);
                     const entity = this.entities.get(pos.entityId);
@@ -555,7 +734,7 @@ class Bot extends events_js_1.TypedEventEmitter {
                 catch (_) { /* ignore */ }
                 break;
             }
-            case play_js_1.PlayClientboundPackets.SET_ENTITY_VELOCITY: {
+            case this.playClientIds.entityVelocity: {
                 try {
                     const vel = (0, play_js_1.parseEntityVelocity)(packet.data);
                     this.emit('entityVelocity', vel.entityId, new vec3_js_1.Vec3(vel.velocityX, vel.velocityY, vel.velocityZ));
@@ -563,7 +742,7 @@ class Bot extends events_js_1.TypedEventEmitter {
                 catch (_) { /* ignore */ }
                 break;
             }
-            case play_js_1.PlayClientboundPackets.ENTITY_HEAD_ROTATION: {
+            case this.playClientIds.entityHeadRotation: {
                 try {
                     const rot = (0, play_js_1.parseEntityHeadRotation)(packet.data);
                     const entity = this.entities.get(rot.entityId);
@@ -574,22 +753,25 @@ class Bot extends events_js_1.TypedEventEmitter {
                 catch (_) { /* ignore */ }
                 break;
             }
-            case play_js_1.PlayClientboundPackets.GAME_EVENT: {
+            case this.playClientIds.gameStateChange: {
                 try {
                     const ev = (0, play_js_1.parseGameEvent)(packet.data);
                     if (ev.event === play_js_1.GameEventType.CHANGE_GAME_MODE) {
                         this._gameMode = ev.value;
                     }
+                    this.weather.handleGameEvent(ev.event, ev.value);
                     if (ev.event === play_js_1.GameEventType.START_WAITING_FOR_LEVEL_CHUNKS) {
                         // Send position confirmation after chunks start loading
-                        this.connection.sendPacket(play_js_1.PlayServerboundPackets.SET_PLAYER_POSITION_AND_ROTATION, (0, play_js_1.buildSetPlayerPositionAndRotationPacket)(this.entity.position.x, this.entity.position.y, this.entity.position.z, this.entity.yaw, this.entity.pitch, true));
+                        if (this.playServerIds.positionLook !== MISSING_PACKET_ID) {
+                            this.connection.sendPacket(this.playServerIds.positionLook, (0, play_js_1.buildSetPlayerPositionAndRotationPacket)(this.entity.position.x, this.entity.position.y, this.entity.position.z, this.entity.yaw, this.entity.pitch, true, this.options.version));
+                        }
                     }
                     this.emit('gameEvent', ev.event, ev.value);
                 }
                 catch (_) { /* ignore */ }
                 break;
             }
-            case play_js_1.PlayClientboundPackets.RESPAWN: {
+            case this.playClientIds.respawn: {
                 try {
                     const resp = (0, play_js_1.parseRespawn)(packet.data);
                     this._gameMode = resp.gameMode;
@@ -603,7 +785,7 @@ class Bot extends events_js_1.TypedEventEmitter {
                 }
                 break;
             }
-            case play_js_1.PlayClientboundPackets.SET_EXPERIENCE: {
+            case this.playClientIds.experience: {
                 try {
                     const exp = (0, play_js_1.parseSetExperience)(packet.data);
                     this._experience = exp.totalExperience;
@@ -613,7 +795,7 @@ class Bot extends events_js_1.TypedEventEmitter {
                 catch (_) { /* ignore */ }
                 break;
             }
-            case play_js_1.PlayClientboundPackets.UPDATE_TIME: {
+            case this.playClientIds.updateTime: {
                 try {
                     const time = (0, play_js_1.parseUpdateTime)(packet.data);
                     this._worldAge = time.worldAge;
@@ -623,7 +805,7 @@ class Bot extends events_js_1.TypedEventEmitter {
                 catch (_) { /* ignore */ }
                 break;
             }
-            case play_js_1.PlayClientboundPackets.SET_DEFAULT_SPAWN_POSITION: {
+            case this.playClientIds.spawnPosition: {
                 try {
                     const sp = (0, play_js_1.parseSetDefaultSpawnPosition)(packet.data);
                     this._spawnPosition = new vec3_js_1.Vec3(sp.x, sp.y, sp.z);
@@ -632,30 +814,73 @@ class Bot extends events_js_1.TypedEventEmitter {
                 catch (_) { /* ignore */ }
                 break;
             }
-            case play_js_1.PlayClientboundPackets.PING: {
+            case this.playClientIds.openWindow: {
+                try {
+                    const open = (0, play_js_1.parseOpenScreen)(packet.data);
+                    this.inventory.openWindow(open.windowId, 0);
+                }
+                catch (err) {
+                    this.logger.error('Failed to parse open screen:', err);
+                }
+                break;
+            }
+            case this.playClientIds.windowItems: {
+                try {
+                    const reader = new types_js_1.BufferReader(packet.data);
+                    const windowId = reader.readUByte();
+                    const stateId = reader.readVarInt();
+                    const slotCount = reader.readVarInt();
+                    // Full slot component parsing is protocol-version dependent.
+                    const items = new Array(slotCount).fill(null);
+                    this.inventory.setContainerContent(windowId, items, stateId, null);
+                }
+                catch (err) {
+                    this.logger.error('Failed to parse container content:', err);
+                }
+                break;
+            }
+            case this.playClientIds.setSlot: {
+                try {
+                    const slot = (0, play_js_1.parseSetContainerSlot)(packet.data);
+                    const item = inventory_js_1.Inventory.parseItem(new types_js_1.BufferReader(slot.slotData));
+                    this.inventory.setSlot(slot.windowId, slot.slot, item, slot.stateId);
+                    this.emit('inventoryUpdate', slot.slot, item);
+                }
+                catch (err) {
+                    this.logger.error('Failed to parse container slot:', err);
+                }
+                break;
+            }
+            case this.playClientIds.closeWindow: {
+                this.inventory.closeWindow();
+                break;
+            }
+            case this.playClientIds.ping: {
                 try {
                     const reader = new types_js_1.BufferReader(packet.data);
                     const pingId = reader.readInt();
-                    this.connection.sendPacket(play_js_1.PlayServerboundPackets.PONG, (0, play_js_1.buildPongPacket)(pingId));
+                    if (this.playServerIds.pong !== MISSING_PACKET_ID) {
+                        this.connection.sendPacket(this.playServerIds.pong, (0, play_js_1.buildPongPacket)(pingId));
+                    }
                 }
                 catch (_) { /* ignore */ }
                 break;
             }
-            case play_js_1.PlayClientboundPackets.ACKNOWLEDGE_BLOCK_CHANGE: {
+            case this.playClientIds.acknowledgePlayerDigging: {
                 try {
                     (0, play_js_1.parseAcknowledgeBlockChange)(packet.data);
                 }
                 catch (_) { /* ignore */ }
                 break;
             }
-            case play_js_1.PlayClientboundPackets.DISCONNECT: {
+            case this.playClientIds.disconnect: {
                 const { reason } = (0, play_js_1.parseDisconnectPlay)(packet.data);
                 this.logger.warn(`Kicked: ${reason}`);
                 this.stopPhysicsTick();
                 this.emit('kicked', reason);
                 break;
             }
-            case play_js_1.PlayClientboundPackets.PLAYER_ABILITIES: {
+            case this.playClientIds.abilities: {
                 try {
                     const abilities = (0, play_js_1.parsePlayerAbilities)(packet.data);
                     this.logger.debug(`Abilities: flags=${abilities.flags} fly=${abilities.flyingSpeed} walk=${abilities.walkingSpeed}`);
@@ -665,10 +890,29 @@ class Bot extends events_js_1.TypedEventEmitter {
                 }
                 break;
             }
-            case play_js_1.PlayClientboundPackets.SYSTEM_CHAT: {
+            case this.playClientIds.systemChat: {
                 try {
                     const chat = (0, play_js_1.parseSystemChat)(packet.data);
-                    this.emit('chat', chat.content, chat.isOverlay);
+                    this.emitChatFromComponent(chat.content, chat.isOverlay);
+                }
+                catch (_) { /* ignore */ }
+                break;
+            }
+            case this.playClientIds.profilelessChat: {
+                try {
+                    const reader = new types_js_1.BufferReader(packet.data);
+                    const content = reader.readString();
+                    this.emitChatFromComponent(content, false);
+                }
+                catch (_) { /* ignore */ }
+                break;
+            }
+            case this.playClientIds.legacyChat: {
+                try {
+                    const reader = new types_js_1.BufferReader(packet.data);
+                    const content = reader.readString();
+                    const position = reader.remaining > 0 ? reader.readByte() : 0;
+                    this.emitChatFromComponent(content, position === 2);
                 }
                 catch (_) { /* ignore */ }
                 break;
@@ -684,7 +928,7 @@ class Bot extends events_js_1.TypedEventEmitter {
                 return;
             // Send position to server every tick to stay "alive"
             try {
-                this.connection.sendPacket(play_js_1.PlayServerboundPackets.SET_PLAYER_POSITION_AND_ROTATION, (0, play_js_1.buildSetPlayerPositionAndRotationPacket)(this.entity.position.x, this.entity.position.y, this.entity.position.z, this.entity.yaw, this.entity.pitch, true));
+                this.sendPlayPacket(this.playServerIds.positionLook, (0, play_js_1.buildSetPlayerPositionAndRotationPacket)(this.entity.position.x, this.entity.position.y, this.entity.position.z, this.entity.yaw, this.entity.pitch, true, this.options.version), 'position_look');
             }
             catch (_) {
                 this.stopPhysicsTick();
@@ -726,38 +970,49 @@ class Bot extends events_js_1.TypedEventEmitter {
      * Send a chat message.
      */
     chat(message) {
-        const chatPlugin = this.plugins.get('chat');
-        if (chatPlugin) {
-            chatPlugin.chat(message);
+        if (this.playServerIds.chatMessage !== MISSING_PACKET_ID) {
+            this.sendPlayPacket(this.playServerIds.chatMessage, (0, play_js_1.buildChatMessagePacket)(message, this.options.version), 'chat_message');
+            return;
+        }
+        if (this.playServerIds.chat !== MISSING_PACKET_ID) {
+            this.sendPlayPacket(this.playServerIds.chat, (0, play_js_1.buildChatMessagePacket)(message, this.options.version), 'chat');
+            return;
         }
+        throw new Error(`Chat is not supported for protocol ${this.options.version}`);
     }
     /**
      * Send a / command (e.g. bot.command('gamemode creative')).
      */
     command(cmd) {
-        this.connection.sendPacket(play_js_1.PlayServerboundPackets.CHAT_COMMAND, (0, play_js_1.buildChatCommandPacket)(cmd));
+        if (this.playServerIds.chatCommand !== MISSING_PACKET_ID) {
+            try {
+                this.sendPlayPacket(this.playServerIds.chatCommand, (0, play_js_1.buildChatCommandPacket)(cmd, this.options.version), 'chat_command');
+                return;
+            }
+            catch (_) {
+                // Fallback to plain chat command below.
+            }
+        }
+        this.chat(`/${cmd}`);
     }
     /**
      * Attack an entity.
      */
     attack(entity) {
-        const combatPlugin = this.plugins.get('combat');
-        if (combatPlugin) {
-            combatPlugin.attack(entity);
-        }
+        this.attackEntity(entity.id);
     }
     /**
      * Attack entity by ID (raw packet).
      */
     attackEntity(entityId) {
-        this.connection.sendPacket(play_js_1.PlayServerboundPackets.INTERACT, (0, play_js_1.buildInteractEntityPacket)(entityId, play_js_1.InteractEntityType.ATTACK, this._isSneaking));
-        this.connection.sendPacket(play_js_1.PlayServerboundPackets.SWING_ARM, (0, play_js_1.buildSwingArmPacket)(0));
+        this.sendPlayPacket(this.playServerIds.useEntity, (0, play_js_1.buildInteractEntityPacket)(entityId, play_js_1.InteractEntityType.ATTACK, this._isSneaking, undefined, undefined, undefined, undefined, this.options.version), 'use_entity');
+        this.sendPlayPacket(this.playServerIds.armAnimation, (0, play_js_1.buildSwingArmPacket)(0, this.options.version), 'arm_animation');
     }
     /**
      * Right-click / use an entity (villager trade, mount, etc.).
      */
     useEntity(entityId, hand = 0) {
-        this.connection.sendPacket(play_js_1.PlayServerboundPackets.INTERACT, (0, play_js_1.buildInteractEntityPacket)(entityId, play_js_1.InteractEntityType.INTERACT, this._isSneaking, undefined, undefined, undefined, hand));
+        this.sendPlayPacket(this.playServerIds.useEntity, (0, play_js_1.buildInteractEntityPacket)(entityId, play_js_1.InteractEntityType.INTERACT, this._isSneaking, undefined, undefined, undefined, hand, this.options.version), 'use_entity');
     }
     /**
      * Set the bot's position (sends position packet to server).
@@ -765,7 +1020,7 @@ class Bot extends events_js_1.TypedEventEmitter {
     setPosition(x, y, z, onGround = true) {
         this.entity.position = new vec3_js_1.Vec3(x, y, z);
         this.entity.onGround = onGround;
-        this.connection.sendPacket(play_js_1.PlayServerboundPackets.SET_PLAYER_POSITION, (0, play_js_1.buildSetPlayerPositionPacket)(x, y, z, onGround));
+        this.sendPlayPacket(this.playServerIds.position, (0, play_js_1.buildSetPlayerPositionPacket)(x, y, z, onGround, this.options.version), 'position');
     }
     /**
      * Set position and rotation.
@@ -775,7 +1030,7 @@ class Bot extends events_js_1.TypedEventEmitter {
         this.entity.yaw = yaw;
         this.entity.pitch = pitch;
         this.entity.onGround = onGround;
-        this.connection.sendPacket(play_js_1.PlayServerboundPackets.SET_PLAYER_POSITION_AND_ROTATION, (0, play_js_1.buildSetPlayerPositionAndRotationPacket)(x, y, z, yaw, pitch, onGround));
+        this.sendPlayPacket(this.playServerIds.positionLook, (0, play_js_1.buildSetPlayerPositionAndRotationPacket)(x, y, z, yaw, pitch, onGround, this.options.version), 'position_look');
     }
     /**
      * Look at a position.
@@ -787,21 +1042,21 @@ class Bot extends events_js_1.TypedEventEmitter {
         const pitch = -Math.atan2(delta.y, distance) * (180 / Math.PI);
         this.entity.yaw = yaw;
         this.entity.pitch = pitch;
-        this.connection.sendPacket(play_js_1.PlayServerboundPackets.SET_PLAYER_POSITION_AND_ROTATION, (0, play_js_1.buildSetPlayerPositionAndRotationPacket)(this.entity.position.x, this.entity.position.y, this.entity.position.z, yaw, pitch, this.entity.onGround));
+        this.sendPlayPacket(this.playServerIds.positionLook, (0, play_js_1.buildSetPlayerPositionAndRotationPacket)(this.entity.position.x, this.entity.position.y, this.entity.position.z, yaw, pitch, this.entity.onGround, this.options.version), 'position_look');
     }
     /**
      * Start/stop sprinting.
      */
     sprint(enabled) {
         this._isSprinting = enabled;
-        this.connection.sendPacket(play_js_1.PlayServerboundPackets.PLAYER_COMMAND, (0, play_js_1.buildPlayerCommandPacket)(this._entityId, enabled ? play_js_1.PlayerCommandAction.START_SPRINTING : play_js_1.PlayerCommandAction.STOP_SPRINTING));
+        this.sendPlayPacket(this.playServerIds.entityAction, (0, play_js_1.buildPlayerCommandPacket)(this._entityId, enabled ? play_js_1.PlayerCommandAction.START_SPRINTING : play_js_1.PlayerCommandAction.STOP_SPRINTING), 'entity_action');
     }
     /**
      * Start/stop sneaking.
      */
     sneak(enabled) {
         this._isSneaking = enabled;
-        this.connection.sendPacket(play_js_1.PlayServerboundPackets.PLAYER_COMMAND, (0, play_js_1.buildPlayerCommandPacket)(this._entityId, enabled ? play_js_1.PlayerCommandAction.START_SNEAKING : play_js_1.PlayerCommandAction.STOP_SNEAKING));
+        this.sendPlayPacket(this.playServerIds.entityAction, (0, play_js_1.buildPlayerCommandPacket)(this._entityId, enabled ? play_js_1.PlayerCommandAction.START_SNEAKING : play_js_1.PlayerCommandAction.STOP_SNEAKING), 'entity_action');
     }
     /**
      * Start digging a block.
@@ -809,13 +1064,13 @@ class Bot extends events_js_1.TypedEventEmitter {
     dig(x, y, z, face = 1) {
         this._actionSequence++;
         // Start digging
-        this.connection.sendPacket(play_js_1.PlayServerboundPackets.PLAYER_ACTION, (0, play_js_1.buildPlayerActionPacket)(play_js_1.PlayerActionStatus.STARTED_DIGGING, x, y, z, face, this._actionSequence));
+        this.sendPlayPacket(this.playServerIds.blockDig, (0, play_js_1.buildPlayerActionPacket)(play_js_1.PlayerActionStatus.STARTED_DIGGING, x, y, z, face, this._actionSequence, this.options.version), 'block_dig');
         // Swing arm animation
-        this.connection.sendPacket(play_js_1.PlayServerboundPackets.SWING_ARM, (0, play_js_1.buildSwingArmPacket)(0));
+        this.sendPlayPacket(this.playServerIds.armAnimation, (0, play_js_1.buildSwingArmPacket)(0, this.options.version), 'arm_animation');
         // For creative mode, finish immediately
         if (this._gameMode === 1) {
             this._actionSequence++;
-            this.connection.sendPacket(play_js_1.PlayServerboundPackets.PLAYER_ACTION, (0, play_js_1.buildPlayerActionPacket)(play_js_1.PlayerActionStatus.FINISHED_DIGGING, x, y, z, face, this._actionSequence));
+            this.sendPlayPacket(this.playServerIds.blockDig, (0, play_js_1.buildPlayerActionPacket)(play_js_1.PlayerActionStatus.FINISHED_DIGGING, x, y, z, face, this._actionSequence, this.options.version), 'block_dig');
         }
     }
     /**
@@ -823,15 +1078,15 @@ class Bot extends events_js_1.TypedEventEmitter {
      */
     placeBlock(x, y, z, face = 1, hand = 0) {
         this._actionSequence++;
-        this.connection.sendPacket(play_js_1.PlayServerboundPackets.USE_ITEM_ON, (0, play_js_1.buildUseItemOnPacket)(hand, x, y, z, face, 0.5, 0.5, 0.5, false, false, this._actionSequence));
-        this.connection.sendPacket(play_js_1.PlayServerboundPackets.SWING_ARM, (0, play_js_1.buildSwingArmPacket)(hand));
+        this.sendPlayPacket(this.playServerIds.blockPlace, (0, play_js_1.buildUseItemOnPacket)(hand, x, y, z, face, 0.5, 0.5, 0.5, false, false, this._actionSequence, this.options.version), 'block_place');
+        this.sendPlayPacket(this.playServerIds.armAnimation, (0, play_js_1.buildSwingArmPacket)(hand, this.options.version), 'arm_animation');
     }
     /**
      * Use the item in hand (eat, throw, shoot bow, etc.).
      */
     useItem(hand = 0) {
         this._actionSequence++;
-        this.connection.sendPacket(play_js_1.PlayServerboundPackets.USE_ITEM, (0, play_js_1.buildUseItemPacket)(hand, this._actionSequence, this.entity.yaw, this.entity.pitch));
+        this.sendPlayPacket(this.playServerIds.useItem, (0, play_js_1.buildUseItemPacket)(hand, this._actionSequence, this.entity.yaw, this.entity.pitch, this.options.version), 'use_item');
     }
     /**
      * Select a hotbar slot (0-8).
@@ -839,52 +1094,57 @@ class Bot extends events_js_1.TypedEventEmitter {
     setHeldItem(slot) {
         if (slot < 0 || slot > 8)
             throw new Error('Slot must be 0-8');
-        this.connection.sendPacket(play_js_1.PlayServerboundPackets.SET_HELD_ITEM, (0, play_js_1.buildSetHeldItemPacket)(slot));
+        this.sendPlayPacket(this.playServerIds.heldItemSlot, (0, play_js_1.buildSetHeldItemPacket)(slot), 'held_item_slot');
     }
     /**
      * Swing arm animation.
      */
     swingArm(hand = 0) {
-        this.connection.sendPacket(play_js_1.PlayServerboundPackets.SWING_ARM, (0, play_js_1.buildSwingArmPacket)(hand));
+        this.sendPlayPacket(this.playServerIds.armAnimation, (0, play_js_1.buildSwingArmPacket)(hand, this.options.version), 'arm_animation');
     }
     /**
      * Drop the held item.
      */
     dropItem(dropStack = false) {
         this._actionSequence++;
-        this.connection.sendPacket(play_js_1.PlayServerboundPackets.PLAYER_ACTION, (0, play_js_1.buildPlayerActionPacket)(dropStack ? play_js_1.PlayerActionStatus.DROP_ITEM_STACK : play_js_1.PlayerActionStatus.DROP_ITEM, 0, 0, 0, 0, this._actionSequence));
+        this.sendPlayPacket(this.playServerIds.blockDig, (0, play_js_1.buildPlayerActionPacket)(dropStack ? play_js_1.PlayerActionStatus.DROP_ITEM_STACK : play_js_1.PlayerActionStatus.DROP_ITEM, 0, 0, 0, 0, this._actionSequence, this.options.version), 'block_dig');
     }
     /**
      * Swap items between main and off hand.
      */
     swapHands() {
         this._actionSequence++;
-        this.connection.sendPacket(play_js_1.PlayServerboundPackets.PLAYER_ACTION, (0, play_js_1.buildPlayerActionPacket)(play_js_1.PlayerActionStatus.SWAP_ITEM_IN_HAND, 0, 0, 0, 0, this._actionSequence));
+        this.sendPlayPacket(this.playServerIds.blockDig, (0, play_js_1.buildPlayerActionPacket)(play_js_1.PlayerActionStatus.SWAP_ITEM_IN_HAND, 0, 0, 0, 0, this._actionSequence, this.options.version), 'block_dig');
     }
     /**
      * Toggle flying (creative/spectator mode).
      */
     fly(enabled) {
-        this.connection.sendPacket(play_js_1.PlayServerboundPackets.PLAYER_ABILITIES, (0, play_js_1.buildPlayerAbilitiesServerboundPacket)(enabled));
+        this.sendPlayPacket(this.playServerIds.abilities, (0, play_js_1.buildPlayerAbilitiesServerboundPacket)(enabled, this.options.version), 'abilities');
     }
     /**
      * Respawn after death.
      */
     respawn() {
-        this.connection.sendPacket(play_js_1.PlayServerboundPackets.CLIENT_STATUS, (0, play_js_1.buildClientStatusPacket)(play_js_1.ClientStatusAction.PERFORM_RESPAWN));
+        this.sendPlayPacket(this.playServerIds.clientCommand, (0, play_js_1.buildClientStatusPacket)(play_js_1.ClientStatusAction.PERFORM_RESPAWN), 'client_command');
         this._isAlive = true;
     }
     /**
      * Close the currently open container.
      */
     closeContainer(windowId = 0) {
-        this.connection.sendPacket(play_js_1.PlayServerboundPackets.CLOSE_CONTAINER, (0, play_js_1.buildCloseContainerPacket)(windowId));
+        this.sendPlayPacket(this.playServerIds.closeWindow, (0, play_js_1.buildCloseContainerPacket)(windowId), 'close_window');
     }
     /**
      * Disconnect from the server.
      */
     disconnect() {
         this.stopPhysicsTick();
+        if (this.playPacketListener) {
+            this.connection.off('packet', this.playPacketListener);
+            this.playPacketListener = null;
+        }
+        this.packetHandlers.clear();
         this.plugins.destroyAll();
         this.connection.disconnect();
         this.logger.info('Disconnected');
@@ -922,7 +1182,7 @@ exports.Bot = Bot;
  *
  * @example
  * ```ts
- * import { createBot } from 'mcbot';
+ * import { createBot } from 'specprotocol';
  *
  * const bot = await createBot({
  *   host: 'localhost',