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

support IntArray and LongArray

Browse Source
This commit is contained in:
JunDao
2019-05-18 22:00:52 +08:00
parent d3c7f45a21
commit 0b9984da07
2 changed files with 106 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
nbt/read.go
View File

@ -51,9 +51,9 @@ func (d *Decoder) unmarshal(val reflect.Value, tagType byte, tagName string) err
switch vk := val.Kind(); vk {
default:
return errors.New("cannot parse TagShort as " + vk.String())
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
case reflect.Int, reflect.Int16, reflect.Int32, reflect.Int64:
val.SetInt(int64(value))
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
case reflect.Uint, reflect.Uint16, reflect.Uint32, reflect.Uint64:
val.SetUint(uint64(value))
}
@ -65,9 +65,9 @@ func (d *Decoder) unmarshal(val reflect.Value, tagType byte, tagName string) err
switch vk := val.Kind(); vk {
default:
return errors.New("cannot parse TagInt as " + vk.String())
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
case reflect.Int, reflect.Int32, reflect.Int64:
val.SetInt(int64(value))
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
case reflect.Uint, reflect.Uint32, reflect.Uint64:
val.SetUint(uint64(value))
}
@ -89,9 +89,9 @@ func (d *Decoder) unmarshal(val reflect.Value, tagType byte, tagName string) err
switch vk := val.Kind(); vk {
default:
return errors.New("cannot parse TagLong as " + vk.String())
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
case reflect.Int, reflect.Int64:
val.SetInt(int64(value))
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
case reflect.Uint, reflect.Uint64:
val.SetUint(uint64(value))
}
@ -129,6 +129,48 @@ func (d *Decoder) unmarshal(val reflect.Value, tagType byte, tagName string) err
}
val.SetBytes(ba)
case TagIntArray:
aryLen, err := d.readInt32()
if err != nil {
return err
}
vt := val.Type() //reciver must be []int or []int32
if vt.Kind() != reflect.Slice {
return errors.New("cannot parse TagIntArray to " + vt.String() + ", it must be a slice")
} else if tk := val.Type().Elem().Kind(); tk != reflect.Int && tk != reflect.Int32 {
return errors.New("cannot parse TagIntArray to " + vt.String())
}
val.Set(reflect.MakeSlice(vt, int(aryLen), int(aryLen)))
for i := 0; i < int(aryLen); i++ {
value, err := d.readInt32()
if err != nil {
return err
}
val.Index(i).SetInt(int64(value))
}
case TagLongArray:
aryLen, err := d.readInt32()
if err != nil {
return err
}
vt := val.Type() //reciver must be []int or []int64
if vt.Kind() != reflect.Slice {
return errors.New("cannot parse TagIntArray to " + vt.String() + ", it must be a slice")
} else if val.Type().Elem().Kind() != reflect.Int64 {
return errors.New("cannot parse TagIntArray to " + vt.String())
}
val.Set(reflect.MakeSlice(vt, int(aryLen), int(aryLen)))
for i := 0; i < int(aryLen); i++ {
value, err := d.readInt64()
if err != nil {
return err
}
val.Index(i).SetInt(value)
}
case TagList:
listType, err := d.r.ReadByte()
if err != nil {