add license and fix some bugs

This commit is contained in:
2026-02-17 22:25:39 +08:00
parent a885a7eec4
commit da87c54494
15 changed files with 528 additions and 543 deletions
-37
View File
@@ -841,35 +841,6 @@ func (c CustomClickAction) WriteTo(w io.Writer) (n int64, err error) {
}
return n, err
}
func (c *CustomPayload) ReadFrom(r io.Reader) (n int64, err error) {
var temp int64
temp, err = (*packet.Identifier)(&c.Channel).ReadFrom(r)
n += temp
if err != nil {
return n, err
}
temp, err = (*packet.ByteArray)(&c.Data).ReadFrom(r)
n += temp
if err != nil {
return n, err
}
return n, err
}
func (c CustomPayload) WriteTo(w io.Writer) (n int64, err error) {
var temp int64
temp, err = (*packet.Identifier)(&c.Channel).WriteTo(w)
n += temp
if err != nil {
return n, err
}
temp, err = (*packet.ByteArray)(&c.Data).WriteTo(w)
n += temp
if err != nil {
return n, err
}
return n, err
}
func (c *DebugSampleSubscription) ReadFrom(r io.Reader) (n int64, err error) {
var temp int64
temp, err = (*packet.VarInt)(&c.SampleType).ReadFrom(r)
@@ -2759,10 +2730,6 @@ func (a *Int8ByteVarIntArray) ReadFrom(r io.Reader) (n int64, err error) {
return n, errors.New("array length less than zero")
}
if size > 32767 {
return n, errors.New("array length greater than 32767")
}
if cap(*a) >= int(size) {
*a = (*a)[:int(size)]
} else {
@@ -2811,10 +2778,6 @@ func (a *StringVarIntArray) ReadFrom(r io.Reader) (n int64, err error) {
return n, errors.New("array length less than zero")
}
if size > 32767 {
return n, errors.New("array length greater than 32767")
}
if cap(*a) >= int(size) {
*a = (*a)[:int(size)]
} else {
@@ -1,11 +1,16 @@
package server
import "git.konjactw.dev/falloutBot/go-mc/data/packetid"
import (
"bytes"
"io"
"git.konjactw.dev/falloutBot/go-mc/data/packetid"
pk "git.konjactw.dev/falloutBot/go-mc/net/packet"
)
//codec:gen
type CustomPayload struct {
Channel string `mc:"Identifier"`
Data []byte `mc:"ByteArray"`
Channel string
Data []byte
}
func (*CustomPayload) PacketID() packetid.ServerboundPacketID {
@@ -17,3 +22,28 @@ func init() {
return &CustomPayload{}
})
}
func (p CustomPayload) WriteTo(w io.Writer) (n int64, err error) {
n, err = pk.Identifier(p.Channel).WriteTo(w)
if err != nil {
return n, err
}
nn, err := bytes.NewBuffer(p.Data).WriteTo(w)
return n + nn, err
}
func (p *CustomPayload) ReadFrom(r io.Reader) (n int64, err error) {
n, err = (*pk.Identifier)(&p.Channel).ReadFrom(r)
if err != nil {
return
}
data := make([]byte, 32767)
nn, err := io.ReadFull(r, data)
if err != nil && (err != io.ErrUnexpectedEOF && err != io.EOF) {
return n + int64(nn), err
}
p.Data = data
return n + int64(nn), nil
}
+2 -10
View File
@@ -13,16 +13,8 @@ type ServerboundPacket interface {
type serverPacketCreator func() ServerboundPacket
var packetRegistry = make(map[packetid.ServerboundPacketID]serverPacketCreator)
var ServerboundPackets = make(map[packetid.ServerboundPacketID]serverPacketCreator)
func registerPacket(id packetid.ServerboundPacketID, creator serverPacketCreator) {
packetRegistry[id] = creator
}
func CreatePacket(id packetid.ServerboundPacketID) (ServerboundPacket, bool) {
creator, ok := packetRegistry[id]
if !ok {
return nil, false
}
return creator(), true
ServerboundPackets[id] = creator
}