falloutBot/go-mc
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add registry implement

Browse Source
This commit is contained in:
Tnze
2024-07-27 22:48:40 +08:00
parent 300304eed3
commit d88ee401fd
7 changed files with 118 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bot/client.go
View File

@ -53,6 +53,7 @@ func (c *Client) Close() error {
func NewClient() *Client {
return &Client{
Auth: Auth{Name: "Steve"},
Registries: registry.NewNetworkCodec(),
Events: Events{handlers: make([][]PacketHandler, packetid.ClientboundPacketIDGuard)},
LoginPlugin: make(map[string]CustomPayloadHandler),
ConfigHandler: NewDefaultConfigHandler(),

40
bot/configuration.go
View File

@ -3,11 +3,11 @@ package bot
import (
"bytes"
"errors"
"fmt"
"io"
"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"
)
@ -141,12 +141,7 @@ func (c *Client) joinConfiguration(conn *net.Conn) error {
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)
@ -154,40 +149,15 @@ func (c *Client) joinConfiguration(conn *net.Conn) error {
return ConfigErr{ErrStage, err}
}
_, err = length.ReadFrom(r)
if err != nil {
return ConfigErr{ErrStage, err}
}
registry := c.Registries.Registry(string(registryID))
if registry == nil {
return ConfigErr{ErrStage, errors.New("unknown registry: " + string(registryID))}
}
fmt.Println(registry)
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.InsertWithNBT(string(entryId), data)
if err != nil {
return ConfigErr{ErrStage, err}
}
}
_, err = registry.(pk.FieldDecoder).ReadFrom(r)
if err != nil {
return ConfigErr{ErrStage, fmt.Errorf("failed to read registry %s: %w", registryID, err)}
}
case packetid.ClientboundConfigResourcePackPop:

4
bot/msg/chat.go
View File

@ -88,7 +88,7 @@ func (m *Manager) handlePlayerChat(packet pk.Packet) error {
if !ok {
return InvalidChatPacket{ErrUnknownPlayer}
}
ct := m.c.Registries.ChatType.FindByID(chatType.ID)
ct := m.c.Registries.ChatType.GetByID(chatType.ID)
if ct == nil {
return InvalidChatPacket{ErrUnknwonChatType}
}
@ -141,7 +141,7 @@ func (m *Manager) handleDisguisedChat(packet pk.Packet) error {
return err
}
ct := m.c.Registries.ChatType.FindByID(chatType.ID)
ct := m.c.Registries.ChatType.GetByID(chatType.ID)
if ct == nil {
return InvalidChatPacket{ErrUnknwonChatType}
}

2
bot/world/chunks.go
View File

@ -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.Registries.DimensionType.FindByID(w.p.DimensionType)
currentDimType := w.c.Registries.DimensionType.GetByID(w.p.DimensionType)
if currentDimType == nil {
return fmt.Errorf("dimension type %d not found", w.p.DimensionType)
}