update 1.19.2 bot, chat support

bot/basic/events.go

@@ -5,35 +5,30 @@ import (
 	"github.com/Tnze/go-mc/chat"
 	"github.com/Tnze/go-mc/data/packetid"
 	pk "github.com/Tnze/go-mc/net/packet"
-	"io"
 )
 
 type EventsListener struct {
 	GameStart    func() error
-	ChatMsg      func(c *PlayerMessage) error
 	SystemMsg    func(c chat.Message, overlay bool) error
 	Disconnect   func(reason chat.Message) error
 	HealthChange func(health float32) error
 	Death        func() error
 }
 
-// Attach your event listener to the client.
+// attach your event listener to the client.
 // The functions are copied when attaching, and modify on [EventListener] doesn't affect after that.
-func (e EventsListener) Attach(c *bot.Client) {
+func (e EventsListener) attach(p *Player) {
 	if e.GameStart != nil {
-		attachJoinGameHandler(c, e.GameStart)
-	}
-	if e.ChatMsg != nil {
-		attachPlayerMsg(c, e.ChatMsg)
+		attachJoinGameHandler(p.c, e.GameStart)
 	}
 	if e.SystemMsg != nil {
-		attachSystemMsg(c, e.SystemMsg)
+		attachSystemMsg(p.c, e.SystemMsg)
 	}
 	if e.Disconnect != nil {
-		attachDisconnect(c, e.Disconnect)
+		attachDisconnect(p.c, e.Disconnect)
 	}
 	if e.HealthChange != nil || e.Death != nil {
-		attachUpdateHealth(c, e.HealthChange, e.Death)
+		attachUpdateHealth(p.c, e.HealthChange, e.Death)
 	}
 }
 
@@ -46,60 +41,6 @@ func attachJoinGameHandler(c *bot.Client, handler func() error) {
 	})
 }
 
-type PlayerMessage struct {
-}
-
-func (p *PlayerMessage) ReadFrom(r io.Reader) (n int64, err error) {
-	// SignedMessageHeader
-	// MessageSignature
-	// SignedMessageBody
-	// Optional<Component>
-	// FilterMask
-	panic("implement me")
-}
-
-type ChatType struct {
-	ID         int32
-	Name       chat.Message
-	TargetName *chat.Message
-}
-
-func (c *ChatType) ReadFrom(r io.Reader) (n int64, err error) {
-	var hasTargetName pk.Boolean
-	n1, err := (*pk.VarInt)(&c.ID).ReadFrom(r)
-	if err != nil {
-		return n1, err
-	}
-	n2, err := c.Name.ReadFrom(r)
-	if err != nil {
-		return n1 + n2, err
-	}
-	n3, err := hasTargetName.ReadFrom(r)
-	if err != nil {
-		return n1 + n2 + n3, err
-	}
-	if hasTargetName {
-		c.TargetName = new(chat.Message)
-		n4, err := c.TargetName.ReadFrom(r)
-		return n1 + n2 + n3 + n4, err
-	}
-	return n1 + n2 + n3, nil
-}
-
-func attachPlayerMsg(c *bot.Client, handler func(c *PlayerMessage) error) {
-	c.Events.AddListener(bot.PacketHandler{
-		Priority: 64, ID: packetid.ClientboundPlayerChat,
-		F: func(p pk.Packet) error {
-			var message PlayerMessage
-			var chatType ChatType
-			if err := p.Scan(&message, &chatType); err != nil {
-				return Error{err}
-			}
-			return handler(&message)
-		},
-	})
-}
-
 func attachSystemMsg(c *bot.Client, handler func(c chat.Message, overlay bool) error) {
 	c.Events.AddListener(bot.PacketHandler{
 		Priority: 64, ID: packetid.ClientboundSystemChat,