add configuration support for /server packet
This commit is contained in:
39
server/configuration.go
Normal file
39
server/configuration.go
Normal file
@ -0,0 +1,39 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"github.com/Tnze/go-mc/chat"
|
||||
"github.com/Tnze/go-mc/data/packetid"
|
||||
"github.com/Tnze/go-mc/net"
|
||||
pk "github.com/Tnze/go-mc/net/packet"
|
||||
"github.com/Tnze/go-mc/registry"
|
||||
)
|
||||
|
||||
type ConfigHandler interface {
|
||||
AcceptConfig(conn *net.Conn) error
|
||||
}
|
||||
|
||||
type Configurations struct {
|
||||
Registries registry.NetworkCodec
|
||||
}
|
||||
|
||||
func (c *Configurations) AcceptConfig(conn *net.Conn) error {
|
||||
err := conn.WritePacket(pk.Marshal(
|
||||
packetid.ClientboundConfigRegistryData,
|
||||
pk.NBT(c.Registries),
|
||||
))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err = conn.WritePacket(pk.Marshal(
|
||||
packetid.ClientboundConfigFinishConfiguration,
|
||||
))
|
||||
return err
|
||||
}
|
||||
|
||||
type ConfigFailErr struct {
|
||||
reason chat.Message
|
||||
}
|
||||
|
||||
func (c ConfigFailErr) Error() string {
|
||||
return "config error: " + c.reason.ClearString()
|
||||
}
|
@ -157,6 +157,15 @@ func (d *MojangLoginHandler) AcceptLogin(conn *net.Conn, protocol int32) (name s
|
||||
pk.String(name),
|
||||
pk.Array(properties),
|
||||
))
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
// receive login ack
|
||||
err = conn.ReadPacket(&p)
|
||||
if err == nil && packetid.ServerboundPacketID(p.ID) != packetid.ServerboundLoginAcknowledged {
|
||||
err = wrongPacketErr{expect: int32(packetid.ServerboundLoginAcknowledged), get: p.ID}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
|
@ -38,14 +38,15 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
ProtocolName = "1.19.4"
|
||||
ProtocolVersion = 762
|
||||
ProtocolName = "1.20.2"
|
||||
ProtocolVersion = 764
|
||||
)
|
||||
|
||||
type Server struct {
|
||||
*log.Logger
|
||||
ListPingHandler
|
||||
LoginHandler
|
||||
ConfigHandler
|
||||
GamePlay
|
||||
}
|
||||
|
||||
@ -89,6 +90,20 @@ func (s *Server) AcceptConn(conn *net.Conn) {
|
||||
}
|
||||
return
|
||||
}
|
||||
s.AcceptConfig(conn)
|
||||
if err != nil {
|
||||
var configErr ConfigFailErr
|
||||
if errors.As(err, &configErr) {
|
||||
_ = conn.WritePacket(pk.Marshal(
|
||||
packetid.ClientboundConfigDisconnect,
|
||||
configErr.reason,
|
||||
))
|
||||
}
|
||||
if s.Logger != nil {
|
||||
s.Logger.Printf("client %v config error: %v", conn.Socket.RemoteAddr(), err)
|
||||
}
|
||||
return
|
||||
}
|
||||
s.AcceptPlayer(name, id, profilePubKey, properties, protocol, conn)
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user