Add registry receiving function

bot/client.go

@@ -10,6 +10,7 @@ import (
 	"github.com/Tnze/go-mc/net"
 	pk "github.com/Tnze/go-mc/net/packet"
 	"github.com/Tnze/go-mc/net/queue"
+	"github.com/Tnze/go-mc/registry"
 )
 
 // Client is used to access Minecraft server
@@ -18,9 +19,9 @@ type Client struct {
 	Auth Auth
 
 	// These are filled when login process
-	Name string
-	UUID uuid.UUID
-	ConfigData
+	Name       string
+	UUID       uuid.UUID
+	Registries registry.NetworkCodec
 
 	// Ingame packet handlers
 	Events Events

bot/configuration.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/Tnze/go-mc/chat"
 	"github.com/Tnze/go-mc/data/packetid"
+	"github.com/Tnze/go-mc/nbt"
 	"github.com/Tnze/go-mc/net"
 	pk "github.com/Tnze/go-mc/net/packet"
 	"github.com/Tnze/go-mc/registry"
@@ -32,10 +33,6 @@ type ResourcePack struct {
 	PromptMessage *chat.Message // Optional
 }
 
-type ConfigData struct {
-	Registries registry.NetworkCodec
-}
-
 type ConfigErr struct {
 	Stage string
 	Err   error
@@ -143,10 +140,50 @@ func (c *Client) joinConfiguration(conn *net.Conn) error {
 			// TODO
 
 		case packetid.ClientboundConfigRegistryData:
+			const ErrStage = "registry"
 			// err := p.Scan(pk.NBT(&c.ConfigData.Registries))
 			// if err != nil {
 			// 	return ConfigErr{"registry data", err}
 			// }
+			var registryID pk.Identifier
+			var length pk.VarInt
+
+			r := bytes.NewReader(p.Data)
+			_, err := registryID.ReadFrom(r)
+			if err != nil {
+				return ConfigErr{ErrStage, err}
+			}
+
+			_, err = length.ReadFrom(r)
+			if err != nil {
+				return ConfigErr{ErrStage, err}
+			}
+
+			for i := 0; i < int(length); i++ {
+				var entryId pk.Identifier
+				var hasData pk.Boolean
+				var data nbt.RawMessage
+				_, err = entryId.ReadFrom(r)
+				if err != nil {
+					return ConfigErr{ErrStage, err}
+				}
+
+				_, err = hasData.ReadFrom(r)
+				if err != nil {
+					return ConfigErr{ErrStage, err}
+				}
+
+				if hasData {
+					_, err = pk.NBT(&data).ReadFrom(r)
+					if err != nil {
+						return ConfigErr{ErrStage, err}
+					}
+					err = registry.InsertNBTDataIntoRegistry(&c.Registries, string(registryID), string(entryId), data)
+					if err != nil {
+						return ConfigErr{ErrStage, err}
+					}
+				}
+			}
 
 		case packetid.ClientboundConfigResourcePackPop:
 			var id pk.Option[pk.UUID, *pk.UUID]

bot/msg/chat.go

@@ -82,15 +82,15 @@ func (m *Manager) handlePlayerChat(packet pk.Packet) error {
 
 	unpackedMsg, err := body.Unpack(&m.SignatureCache)
 	if err != nil {
-		return InvalidChatPacket
+		return InvalidChatPacket{err}
 	}
 	senderInfo, ok := m.pl.PlayerInfos[uuid.UUID(sender)]
 	if !ok {
-		return InvalidChatPacket
+		return InvalidChatPacket{ErrUnknownPlayer}
 	}
 	ct := m.c.Registries.ChatType.FindByID(chatType.ID)
 	if ct == nil {
-		return InvalidChatPacket
+		return InvalidChatPacket{ErrUnknwonChatType}
 	}
 
 	var message sign.Message
@@ -115,7 +115,7 @@ func (m *Manager) handlePlayerChat(packet pk.Packet) error {
 	var validated bool
 	if senderInfo.ChatSession != nil {
 		if !senderInfo.ChatSession.VerifyAndUpdate(&message) {
-			return ValidationFailed
+			return ErrValidationFailed
 		}
 		validated = true
 		// store signature into signatureCache
@@ -143,7 +143,7 @@ func (m *Manager) handleDisguisedChat(packet pk.Packet) error {
 
 	ct := m.c.Registries.ChatType.FindByID(chatType.ID)
 	if ct == nil {
-		return InvalidChatPacket
+		return InvalidChatPacket{ErrUnknwonChatType}
 	}
 	msg := chatType.Decorate(message, &ct.Chat)
 
@@ -199,7 +199,23 @@ func (m *Manager) SendCommand(command string) error {
 	return err
 }
 
+type InvalidChatPacket struct {
+	err error
+}
+
+func (i InvalidChatPacket) Error() string {
+	if i.err == nil {
+		return "invalid chat packet"
+	}
+	return "invalid chat packet: " + i.err.Error()
+}
+
+func (i InvalidChatPacket) Unwrap() error {
+	return i.err
+}
+
 var (
-	InvalidChatPacket       = errors.New("invalid chat packet")
-	ValidationFailed  error = bot.DisconnectErr(chat.TranslateMsg("multiplayer.disconnect.chat_validation_failed"))
+	ErrUnknownPlayer          = errors.New("unknown player")
+	ErrUnknwonChatType        = errors.New("unknown chat type")
+	ErrValidationFailed error = bot.DisconnectErr(chat.TranslateMsg("multiplayer.disconnect.chat_validation_failed"))
 )

bot/world/chunks.go

@@ -41,7 +41,7 @@ func (w *World) onPlayerSpawn(pk.Packet) error {
 
 func (w *World) handleLevelChunkWithLightPacket(packet pk.Packet) error {
 	var pos level.ChunkPos
-	_, currentDimType := w.c.ConfigData.Registries.DimensionType.Find(w.p.DimensionType)
+	_, currentDimType := w.c.Registries.DimensionType.Find(w.p.DimensionType)
 	if currentDimType == nil {
 		return errors.New("dimension type " + w.p.DimensionType + " not found")
 	}