move SystemChat event from bot/basic to bot/msg

bot/basic/basic.go

@@ -15,7 +15,6 @@
 // Handles some basic event you probably need.
 //   - GameStart
 //   - ChatMsg
-//   - SystemMsg
 //   - Disconnect
 //   - HealthChange
 //   - Death

bot/basic/events.go

@@ -9,7 +9,6 @@ import (
 
 type EventsListener struct {
 	GameStart    func() error
-	SystemMsg    func(c chat.Message, overlay bool) error
 	Disconnect   func(reason chat.Message) error
 	HealthChange func(health float32) error
 	Death        func() error
@@ -21,9 +20,6 @@ func (e EventsListener) attach(p *Player) {
 	if e.GameStart != nil {
 		attachJoinGameHandler(p.c, e.GameStart)
 	}
-	if e.SystemMsg != nil {
-		attachSystemMsg(p.c, e.SystemMsg)
-	}
 	if e.Disconnect != nil {
 		attachDisconnect(p.c, e.Disconnect)
 	}
@@ -41,20 +37,6 @@ func attachJoinGameHandler(c *bot.Client, handler func() error) {
 	})
 }
 
-func attachSystemMsg(c *bot.Client, handler func(c chat.Message, overlay bool) error) {
-	c.Events.AddListener(bot.PacketHandler{
-		Priority: 64, ID: packetid.ClientboundSystemChat,
-		F: func(p pk.Packet) error {
-			var msg chat.Message
-			var pos pk.Boolean
-			if err := p.Scan(&msg, &pos); err != nil {
-				return Error{err}
-			}
-			return handler(msg, bool(pos))
-		},
-	})
-}
-
 func attachDisconnect(c *bot.Client, handler func(reason chat.Message) error) {
 	c.Events.AddListener(bot.PacketHandler{
 		Priority: 64, ID: packetid.ClientboundDisconnect,

bot/msg/chat.go

@@ -34,6 +34,12 @@ func New(c *bot.Client, p *basic.Player, pl *playerlist.PlayerList, events Event
 		events:         events,
 		SignatureCache: sign.NewSignatureCache(),
 	}
+	if events.SystemChat != nil {
+		c.Events.AddListener(bot.PacketHandler{
+			Priority: 64, ID: packetid.ClientboundSystemChat,
+			F: m.handleSystemMessage,
+		})
+	}
 	if events.PlayerChatMessage != nil {
 		c.Events.AddListener(bot.PacketHandler{
 			Priority: 64, ID: packetid.ClientboundPlayerChat,
@@ -49,6 +55,15 @@ func New(c *bot.Client, p *basic.Player, pl *playerlist.PlayerList, events Event
 	return m
 }
 
+func (m *Manager) handleSystemMessage(p pk.Packet) error {
+	var msg chat.Message
+	var overlay pk.Boolean
+	if err := p.Scan(&msg, &overlay); err != nil {
+		return err
+	}
+	return m.events.SystemChat(msg, bool(overlay))
+}
+
 func (m *Manager) handlePlayerChat(packet pk.Packet) error {
 	var (
 		sender          pk.UUID

bot/msg/events.go

@@ -3,6 +3,7 @@ package msg
 import "github.com/Tnze/go-mc/chat"
 
 type EventsHandler struct {
+	SystemChat        func(msg chat.Message, overlay bool) error
 	PlayerChatMessage func(msg chat.Message, validated bool) error
 	DisguisedChat     func(msg chat.Message) error
 }