From e40735d2d3887990b323aac9131eb16cd15a7dd9 Mon Sep 17 00:00:00 2001
From: patyhank <mlpmmy@gmail.com>
Date: Mon, 13 Jun 2022 16:42:47 +0800
Subject: [PATCH] Fix Example

---
 bot/basic/events.go           |  4 ++--
 examples/autofish/autofish.go | 10 +++++++---
 examples/daze/daze.go         | 10 +++++++---
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/bot/basic/events.go b/bot/basic/events.go
index fa9ea24..8c28a48 100644
--- a/bot/basic/events.go
+++ b/bot/basic/events.go
@@ -12,7 +12,7 @@ import (
 
 type EventsListener struct {
 	GameStart    func() error
-	ChatMsg      func(c *PlayerMessage, pos byte, uuid uuid.UUID) error
+	ChatMsg      func(c *PlayerMessage) error
 	SystemMsg    func(c chat.Message, pos byte) error
 	Disconnect   func(reason chat.Message) error
 	HealthChange func(health float32) error
@@ -106,7 +106,7 @@ func (e *EventsListener) onPlayerMsg(p pk.Packet) error {
 		if err := message.SenderTeamName.UnmarshalJSON([]byte(senderDisplayName)); err != nil {
 			return Error{err}
 		}
-		return e.ChatMsg(&message, byte(message.Position), message.Sender)
+		return e.ChatMsg(&message)
 	}
 	return nil
 }
diff --git a/examples/autofish/autofish.go b/examples/autofish/autofish.go
index a2a3c81..54d25d8 100644
--- a/examples/autofish/autofish.go
+++ b/examples/autofish/autofish.go
@@ -4,7 +4,6 @@ import (
 	"log"
 	"time"
 
-	"github.com/google/uuid"
 	//"github.com/mattn/go-colorable"
 
 	"github.com/Tnze/go-mc/bot"
@@ -33,6 +32,7 @@ func main() {
 	basic.EventsListener{
 		GameStart:  onGameStart,
 		ChatMsg:    onChatMsg,
+		SystemMsg:  onSystemMsg,
 		Disconnect: onDisconnect,
 		Death:      onDeath,
 	}.Attach(c)
@@ -107,8 +107,12 @@ func onSound(id int, category int, x, y, z float64, volume, pitch float32) error
 	return nil
 }
 
-func onChatMsg(c chat.Message, pos byte, uuid uuid.UUID) error {
-	log.Println("Chat:", c)
+func onChatMsg(c *basic.PlayerMessage) error {
+	log.Println("Chat:", c.SignedMessage.String())
+	return nil
+}
+func onSystemMsg(c chat.Message, pos byte) error {
+	log.Printf("System: %v, Location: %v", c.String(), pos)
 	return nil
 }
 
diff --git a/examples/daze/daze.go b/examples/daze/daze.go
index b39893e..df52722 100644
--- a/examples/daze/daze.go
+++ b/examples/daze/daze.go
@@ -8,7 +8,6 @@ import (
 	"log"
 	"time"
 
-	"github.com/google/uuid"
 	//"github.com/mattn/go-colorable"
 
 	"github.com/Tnze/go-mc/bot"
@@ -36,6 +35,7 @@ func main() {
 	basic.EventsListener{
 		GameStart:    onGameStart,
 		ChatMsg:      onChatMsg,
+		SystemMsg:    onSystemMsg,
 		Disconnect:   onDisconnect,
 		HealthChange: nil,
 		Death:        onDeath,
@@ -95,8 +95,12 @@ func onGameStart() error {
 	return nil //if err isn't nil, HandleGame() will return it.
 }
 
-func onChatMsg(c chat.Message, _ byte, _ uuid.UUID) error {
-	log.Println("Chat:", c) // output chat message without any format code (like color or bold)
+func onChatMsg(c *basic.PlayerMessage) error {
+	log.Println("Chat:", c.SignedMessage.String())
+	return nil
+}
+func onSystemMsg(c chat.Message, pos byte) error {
+	log.Printf("System: %v, Location: %v", c.String(), pos)
 	return nil
 }