diff --git a/bot/ingame.go b/bot/ingame.go
index afa2cbc..5b35398 100644
--- a/bot/ingame.go
+++ b/bot/ingame.go
@@ -274,8 +274,9 @@ func handleSetSlotPacket(c *Client, p pk.Packet) error {
 
 func handleChatMessagePacket(c *Client, p pk.Packet) (err error) {
 	var (
-		s   chat.Message
-		pos pk.Byte
+		s      chat.Message
+		pos    pk.Byte
+		sender pk.UUID
 	)
 
 	err = p.Scan(&s, &pos)
diff --git a/data/packetIDs.go b/data/packetIDs.go
index 2f349d0..7e3493e 100644
--- a/data/packetIDs.go
+++ b/data/packetIDs.go
@@ -4,26 +4,25 @@ package data
 const (
 	SpawnObject byte = iota //0x00
 	SpawnExperienceOrb
-	SpawnGlobalEntity
-	SpawnMob
+	SpawnLivingEntity
 	SpawnPainting
 	SpawnPlayer
-	AnimationClientbound
+	EntityAnimationClientbound
 	Statistics
 	AcknowledgePlayerDigging
 	BlockBreakAnimation
-	UpdateBlockEntity
+	BlockEntityData
 	BlockAction
 	BlockChange
 	BossBar
 	ServerDifficulty
 	ChatMessageClientbound
+	MultiBlockChange
 
-	MultiBlockChange //0x10
-	TabComplete
+	TabComplete //0x10
 	DeclareCommands
-	ConfirmTransaction
-	CloseWindow
+	WindowConfirmationClientbound
+	CloseWindowClientbound
 	WindowItems
 	WindowProperty
 	SetSlot
@@ -35,14 +34,14 @@ const (
 	Explosion
 	UnloadChunk
 	ChangeGameState
+	OpenHorseWindow
 
-	OpenHorseWindow //0x20
-	KeepAliveClientbound
-	ChunkData
+	KeepAliveClientbound //0x20
+	ChunkData            // TODO Pre
 	Effect
 	Particle
 	UpdateLight
-	JoinGame
+	JoinGame // TODO Pre
 	MapData
 	TradeList
 	EntityRelativeMove
@@ -52,9 +51,9 @@ const (
 	VehicleMoveClientbound
 	OpenBook
 	OpenWindow
+	OpenSignEditor
 
-	OpenSignEditor //0x30
-	CraftRecipeResponse
+	CraftRecipeResponse //0x30
 	PlayerAbilitiesClientbound
 	CombatEvent
 	PlayerInfo
@@ -69,10 +68,11 @@ const (
 	SelectAdvancementTab
 	WorldBorder
 	Camera
+	HeldItemChangeClientbound
 
-	HeldItemChangeClientbound //0x40
-	UpdateViewPosition
+	UpdateViewPosition //0x40
 	UpdateViewDistance
+	SpawnPosition
 	DisplayScoreboard
 	EntityMetadata
 	AttachEntity
@@ -84,11 +84,10 @@ const (
 	SetPassengers
 	Teams
 	UpdateScore
-	SpawnPosition
 	TimeUpdate
+	Title
 
-	Title //0x50
-	EntitySoundEffect
+	EntitySoundEffect //0x50
 	SoundEffect
 	StopSound
 	PlayerListHeaderAndFooter
@@ -98,8 +97,8 @@ const (
 	Advancements
 	EntityProperties
 	EntityEffect
-	DeclareRecipes
-	Tags //0x5C
+	DeclareRecipes // TODO Pre
+	Tags           //0x5B
 )
 
 // Serverbound packet IDs
@@ -119,9 +118,10 @@ const (
 	EditBook
 	QueryEntityNBT
 	UseEntity
-	KeepAliveServerbound
+	GenerateStructure
 
-	LockDifficulty //0x10
+	KeepAliveServerbound //0x10
+	LockDifficulty
 	PlayerPosition
 	PlayerPositionAndLookServerbound
 	PlayerLook
@@ -136,9 +136,9 @@ const (
 	SteerVehicle
 	RecipeBookData
 	NameItem
-	ResourcePackStatus
 
-	AdvancementTab //0x20
+	ResourcePackStatus //0x20
+	AdvancementTab
 	SelectTrade
 	SetBeaconEffect
 	HeldItemChangeServerbound
@@ -151,5 +151,5 @@ const (
 	AnimationServerbound
 	Spectate
 	PlayerBlockPlacement
-	UseItem //0x2D
+	UseItem //0x2E
 )