update 1.19.2 bot, chat support

examples/autofish/autofish.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	botchat "github.com/Tnze/go-mc/bot/chat"
 	"log"
 	"time"
 
@@ -17,8 +18,9 @@ import (
 const timeout = 45
 
 var (
-	c *bot.Client
-	p *basic.Player
+	c  *bot.Client
+	p  *basic.Player
+	bc *botchat.Chat
 
 	watch chan time.Time
 )
@@ -26,16 +28,16 @@ var (
 func main() {
 	//log.SetOutput(colorable.NewColorableStdout()) // optional for colorable output
 	c = bot.NewClient()
-	p = basic.NewPlayer(c, basic.DefaultSettings)
-
-	//Register event handlers
-	basic.EventsListener{
+	p = basic.NewPlayer(c, basic.DefaultSettings, basic.EventsListener{
 		GameStart:  onGameStart,
-		ChatMsg:    onChatMsg,
 		SystemMsg:  onSystemMsg,
 		Disconnect: onDisconnect,
 		Death:      onDeath,
-	}.Attach(c)
+	})
+	bc = botchat.NewChat(c, p, botchat.EventsHandler{PlayerChatMessage: onChatMsg})
+
+	//Register event handlers
+
 	c.Events.AddListener(soundListener)
 
 	//Login
@@ -107,13 +109,13 @@ func onSound(id int, category int, x, y, z float64, volume, pitch float32) error
 	return nil
 }
 
-func onChatMsg(c *basic.PlayerMessage) error {
-	log.Println("Chat:", c.SignedMessage)
+func onChatMsg(c chat.Message) error {
+	log.Println("Chat:", c)
 	return nil
 }
 
-func onSystemMsg(c chat.Message, pos byte) error {
-	log.Printf("System: %v, Location: %v", c, pos)
+func onSystemMsg(c chat.Message, overlay bool) error {
+	log.Printf("System: %v, Overlay: %v", c, overlay)
 	return nil
 }
 

examples/daze/daze.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/Tnze/go-mc/bot"
 	"github.com/Tnze/go-mc/bot/basic"
+	botchat "github.com/Tnze/go-mc/bot/chat"
 	"github.com/Tnze/go-mc/bot/screen"
 	"github.com/Tnze/go-mc/bot/world"
 	"github.com/Tnze/go-mc/chat"
@@ -27,6 +28,7 @@ var accessToken = flag.String("token", "", "AccessToken")
 
 var client *bot.Client
 var player *basic.Player
+var chatHandler *botchat.Chat
 var worldManager *world.World
 var screenManager *screen.Manager
 
@@ -39,15 +41,16 @@ func main() {
 		UUID: *playerID,
 		AsTk: *accessToken,
 	}
-	player = basic.NewPlayer(client, basic.DefaultSettings)
-	basic.EventsListener{
+	player = basic.NewPlayer(client, basic.DefaultSettings, basic.EventsListener{
 		GameStart:    onGameStart,
-		ChatMsg:      onChatMsg,
 		SystemMsg:    onSystemMsg,
 		Disconnect:   onDisconnect,
 		HealthChange: onHealthChange,
 		Death:        onDeath,
-	}.Attach(client)
+	})
+	chatHandler = botchat.NewChat(client, player, botchat.EventsHandler{
+		PlayerChatMessage: onPlayerMsg,
+	})
 	worldManager = world.NewWorld(client, player, world.EventsListener{
 		LoadChunk:   onChunkLoad,
 		UnloadChunk: onChunkUnload,
@@ -103,13 +106,13 @@ func onGameStart() error {
 	return nil //if err isn't nil, HandleGame() will return it.
 }
 
-func onChatMsg(c *basic.PlayerMessage) error {
-	log.Println("Chat:", c.SignedMessage.String())
+func onPlayerMsg(msg chat.Message) error {
+	log.Printf("Player: %v", msg)
 	return nil
 }
 
-func onSystemMsg(c chat.Message, pos byte) error {
-	log.Printf("System: %v, Location: %v", c, pos)
+func onSystemMsg(c chat.Message, overlay bool) error {
+	log.Printf("System: %v, Overlay: %v", c, overlay)
 	return nil
 }
 

examples/dazeReadCommand/daze.go

@@ -28,7 +28,7 @@ func main() {
 	//log.SetOutput(colorable.NewColorableStdout())
 	client = bot.NewClient()
 	client.Auth.Name = "Daze"
-	player = basic.NewPlayer(client, basic.DefaultSettings)
+	player = basic.NewPlayer(client, basic.DefaultSettings, basic.EventsListener{})
 	client.Events.AddListener(bot.PacketHandler{
 		ID:       packetid.ClientboundCommands,
 		Priority: 50,

examples/pressureTest/main.go

@@ -44,11 +44,10 @@ func newIndividual(id int, name string) (i *individual) {
 	i.id = id
 	i.client = bot.NewClient()
 	i.client.Auth.Name = name
-	i.player = basic.NewPlayer(i.client, basic.DefaultSettings)
-	basic.EventsListener{
+	i.player = basic.NewPlayer(i.client, basic.DefaultSettings, basic.EventsListener{
 		GameStart:  i.onGameStart,
 		Disconnect: onDisconnect,
-	}.Attach(i.client)
+	})
 	return
 }