From c1530e601e00e49ba6b2c65fa010fd082a2f2844 Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Mon, 6 Jun 2022 23:55:02 +0200 Subject: [PATCH] Strip trailing whitespace --- deserialize.fmt | 32 ++++---- serialize.fmt | 46 ++++++------ serialize.go | 194 ------------------------------------------------ 3 files changed, 39 insertions(+), 233 deletions(-) diff --git a/deserialize.fmt b/deserialize.fmt index cc70b33..668dc9d 100644 --- a/deserialize.fmt +++ b/deserialize.fmt @@ -4,23 +4,23 @@ chk(err) return buf } - + func read8 (r io.Reader) uint8 { return readBuf(r, 1)[0] } func read16(r io.Reader) uint16 { return be.Uint16(readBuf(r, 2)) } func read32(r io.Reader) uint32 { return be.Uint32(readBuf(r, 4)) } func read64(r io.Reader) uint64 { return be.Uint64(readBuf(r, 8)) } - + byte *p = read8(r) uint8 *p = read8(r) uint16 *p = read16(r) uint32 *p = read32(r) uint64 *p = read64(r) - + int8 *p = int8(read8(r)) int16 *p = int16(read16(r)) int32 *p = int32(read32(r)) int64 *p = int64(read64(r)) - + bool switch n := read8(r); n { case 0: *p = false @@ -29,22 +29,22 @@ bool switch n := read8(r); n { default: chk(fmt.Errorf("invalid bool: %d", n)) } - + float32 *p = math.Float32frombits(read32(r)) float64 *p = math.Float64frombits(read64(r)) - + AOMsg { var err error *p, err = readAOMsg(r) chk(err) } - + image/color.NRGBA *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} - + map[uint16]*NodeMeta { r, err := zlib.NewReader(byteReader{r}) chk(err) - + switch ver := read8(r); ver { case 0: *p = nil @@ -60,14 +60,14 @@ map[uint16]*NodeMeta { default: chk(fmt.Errorf("unsupported nodemetas version: %d", ver)) } - + chk(r.Close()) } - + map[[3]int16]*NodeMeta { r, err := zlib.NewReader(byteReader{r}) chk(err) - + switch ver := read8(r); ver { case 0: *p = nil @@ -86,16 +86,16 @@ map[[3]int16]*NodeMeta { default: chk(fmt.Errorf("unsupported nodemetas version: %d", ver)) } - + chk(r.Close()) } - + PointedThing { var err error *p, err = readPointedThing(r) chk(err) } - + []AOMsg { // For AOInitData.Msgs. *p = make([]AOMsg, read8(r)) for i := range *p { @@ -108,7 +108,7 @@ PointedThing { } } } - + []NodeDef { // For ToCltNodeDefs.Defs. *p = make([]NodeDef, read16(r)) r := &io.LimitedReader{R: r, N: int64(read32(r))} diff --git a/serialize.fmt b/serialize.fmt index c4cf9bd..1095c92 100644 --- a/serialize.fmt +++ b/serialize.fmt @@ -2,51 +2,51 @@ _, err := w.Write([]byte{x}) chk(err) } - + func write16(w io.Writer, x uint16) { buf := make([]byte, 2) be.PutUint16(buf, x) _, err := w.Write(buf) chk(err) } - + func write32(w io.Writer, x uint32) { buf := make([]byte, 4) be.PutUint32(buf, x) _, err := w.Write(buf) chk(err) } - + func write64(w io.Writer, x uint64) { buf := make([]byte, 8) be.PutUint64(buf, x) _, err := w.Write(buf) chk(err) } - + byte write8(w, uint8(x)) uint8 write8(w, uint8(x)) uint16 write16(w, uint16(x)) uint32 write32(w, uint32(x)) uint64 write64(w, uint64(x)) - + int8 write8(w, uint8(x)) int16 write16(w, uint16(x)) int32 write32(w, uint32(x)) int64 write64(w, uint64(x)) - + bool if x { write8(w, 1) } else { write8(w, 0) } - + float32 write32(w, math.Float32bits(x)) float64 write64(w, math.Float64bits(x)) - + AOMsg writeAOMsg(w, x) - + image/color.NRGBA w.Write([]byte{x.A, x.R, x.G, x.B}) - + map[uint16]*NodeMeta { w := zlib.NewWriter(w) - + if x == nil { write8(w, 0) } else { @@ -61,9 +61,9 @@ map[uint16]*NodeMeta { i2pos := func(i int) [3]int16 { return Blkpos2Pos([3]int16{}, keys[i]) } - + p, q := i2pos(i), i2pos(j) - + for i := range p { switch { case p[i] < q[i]: @@ -72,7 +72,7 @@ map[uint16]*NodeMeta { return false } } - + return false }) for _, key := range keys { @@ -80,13 +80,13 @@ map[uint16]*NodeMeta { chk(serialize(w, x[key])) } } - + chk(w.Close()) } - + map[[3]int16]*NodeMeta { w := zlib.NewWriter(w) - + if x == nil { write8(w, 0) } else { @@ -101,7 +101,7 @@ map[[3]int16]*NodeMeta { } sort.Slice(keys, func(i, j int) bool { p, q := keys[i], keys[j] - + for i := range p { switch { case p[i] < q[i]: @@ -110,7 +110,7 @@ map[[3]int16]*NodeMeta { return false } } - + return false }) for _, key := range keys { @@ -120,12 +120,12 @@ map[[3]int16]*NodeMeta { chk(serialize(w, x[key])) } } - + chk(w.Close()) } - + PointedThing chk(writePointedThing(w, x)) - + []AOMsg { // For AOInitData.Msgs. if len(x) > math.MaxUint8 { chk(ErrTooLong) @@ -142,7 +142,7 @@ PointedThing chk(writePointedThing(w, x)) chk(err) } } - + []NodeDef { // For ToCltNodeDefs.Defs. if len(x) > math.MaxUint16 { chk(ErrTooLong) diff --git a/serialize.go b/serialize.go index daa323d..257b15a 100644 --- a/serialize.go +++ b/serialize.go @@ -20,35 +20,30 @@ func write8(w io.Writer, x uint8) { _, err := w.Write([]byte{x}) chk(err) } - func write16(w io.Writer, x uint16) { buf := make([]byte, 2) be.PutUint16(buf, x) _, err := w.Write(buf) chk(err) } - func write32(w io.Writer, x uint32) { buf := make([]byte, 4) be.PutUint32(buf, x) _, err := w.Write(buf) chk(err) } - func write64(w io.Writer, x uint64) { buf := make([]byte, 8) be.PutUint64(buf, x) _, err := w.Write(buf) chk(err) } - func readBuf(r io.Reader, n int) []byte { buf := make([]byte, n) _, err := io.ReadFull(r, buf) chk(err) return buf } - func read8(r io.Reader) uint8 { return readBuf(r, 1)[0] } func read16(r io.Reader) uint16 { return be.Uint16(readBuf(r, 2)) } func read32(r io.Reader) uint32 { return be.Uint32(readBuf(r, 4)) } @@ -164,7 +159,6 @@ func (obj *ToSrvInit) serialize(w io.Writer) { } else { write8(w, 0) } - } }); err != nil && err != io.EOF { chk(err) @@ -263,7 +257,6 @@ func (obj *ToSrvInit) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } }); err != nil && err != io.EOF { chk(err) @@ -752,7 +745,6 @@ func (obj *ToSrvInteract) serialize(w io.Writer) { Pos PlayerPos }))(obj)).Pointed chk(writePointedThing(w, x)) - } { buf := w @@ -835,7 +827,6 @@ func (obj *ToSrvInteract) deserialize(r io.Reader) { *p, err = readPointedThing(r) chk(err) } - } if r.N > 0 { chk(fmt.Errorf("%d bytes of trailing data", r.N)) @@ -1415,7 +1406,6 @@ func (obj *ToSrvFirstSRP) serialize(w io.Writer) { } else { write8(w, 0) } - } } @@ -1470,7 +1460,6 @@ func (obj *ToSrvFirstSRP) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } } @@ -1505,7 +1494,6 @@ func (obj *ToSrvSRPBytesA) serialize(w io.Writer) { } else { write8(w, 0) } - } } @@ -1539,7 +1527,6 @@ func (obj *ToSrvSRPBytesA) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } } @@ -1759,7 +1746,6 @@ func (obj *ToCltAcceptAuth) serialize(w io.Writer) { SudoAuthMethods AuthMethods }))(obj)).MapSeed write64(w, uint64(x)) - } { x := (*(*(struct { @@ -1823,7 +1809,6 @@ func (obj *ToCltAcceptAuth) deserialize(r io.Reader) { SudoAuthMethods AuthMethods }))(obj)).MapSeed *p = read64(r) - } { p := &(*(*(struct { @@ -2004,7 +1989,6 @@ func (obj *ToCltKick) serialize(w io.Writer) { } else { write8(w, 0) } - } } } @@ -2094,7 +2078,6 @@ func (obj *ToCltKick) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } } } @@ -2189,7 +2172,6 @@ func (obj *ToCltAddNode) serialize(w io.Writer) { } else { write8(w, 0) } - } } @@ -2234,7 +2216,6 @@ func (obj *ToCltAddNode) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } } @@ -2475,7 +2456,6 @@ func (obj *ToCltMediaPush) serialize(w io.Writer) { } else { write8(w, 0) } - } } @@ -2538,7 +2518,6 @@ func (obj *ToCltMediaPush) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } } @@ -2617,7 +2596,6 @@ func (obj *ToCltChatMsg) serialize(w io.Writer) { Timestamp int64 // Unix time. }))(obj)).Timestamp write64(w, uint64(x)) - } } @@ -2700,7 +2678,6 @@ func (obj *ToCltChatMsg) deserialize(r io.Reader) { Timestamp int64 // Unix time. }))(obj)).Timestamp *p = int64(read64(r)) - } } @@ -2998,7 +2975,6 @@ func (obj *ToCltFOV) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -3033,7 +3009,6 @@ func (obj *ToCltFOV) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -3056,7 +3031,6 @@ func (obj *ToCltDeathScreen) serialize(w io.Writer) { } else { write8(w, 0) } - } if err := pcall(func() { ((*(*(struct { @@ -3085,7 +3059,6 @@ func (obj *ToCltDeathScreen) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } if err := pcall(func() { ((*(*(struct { @@ -4078,7 +4051,6 @@ func (obj *ToCltPlaySound) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -4128,7 +4100,6 @@ func (obj *ToCltPlaySound) serialize(w io.Writer) { } else { write8(w, 0) } - } } @@ -4268,7 +4239,6 @@ func (obj *ToCltPlaySound) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -4321,7 +4291,6 @@ func (obj *ToCltPlaySound) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } } @@ -4503,7 +4472,6 @@ func (obj *ToCltDetachedInv) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -4566,7 +4534,6 @@ func (obj *ToCltDetachedInv) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -5096,7 +5063,6 @@ func (obj *ToCltSpawnParticle) serialize(w io.Writer) { } else { write8(w, 0) } - } if len(([]byte(*(*string)(&((*(*(struct { Pos, Vel, Acc [3]float32 @@ -5184,7 +5150,6 @@ func (obj *ToCltSpawnParticle) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -5210,7 +5175,6 @@ func (obj *ToCltSpawnParticle) serialize(w io.Writer) { } else { write8(w, 0) } - } if err := pcall(func() { ((*(*(struct { @@ -5282,7 +5246,6 @@ func (obj *ToCltSpawnParticle) serialize(w io.Writer) { } else { write8(w, 0) } - } if err := pcall(func() { ((*(*(struct { @@ -5543,7 +5506,6 @@ func (obj *ToCltSpawnParticle) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } var local152 []uint8 var local153 uint32 @@ -5601,7 +5563,6 @@ func (obj *ToCltSpawnParticle) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -5630,7 +5591,6 @@ func (obj *ToCltSpawnParticle) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } if err := pcall(func() { ((*(*(struct { @@ -5705,7 +5665,6 @@ func (obj *ToCltSpawnParticle) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } if err := pcall(func() { ((*(*(struct { @@ -6164,7 +6123,6 @@ func (obj *ToCltAddParticleSpawner) serialize(w io.Writer) { } else { write8(w, 0) } - } if len(([]byte(*(*string)(&((*(*(struct { Amount uint16 @@ -6297,7 +6255,6 @@ func (obj *ToCltAddParticleSpawner) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -6327,7 +6284,6 @@ func (obj *ToCltAddParticleSpawner) serialize(w io.Writer) { } else { write8(w, 0) } - } if err := pcall(func() { ((*(*(struct { @@ -6440,7 +6396,6 @@ func (obj *ToCltAddParticleSpawner) serialize(w io.Writer) { } else { write8(w, 0) } - } if err := pcall(func() { ((*(*(struct { @@ -6914,7 +6869,6 @@ func (obj *ToCltAddParticleSpawner) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } var local170 []uint8 var local171 uint32 @@ -7009,7 +6963,6 @@ func (obj *ToCltAddParticleSpawner) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -7042,7 +6995,6 @@ func (obj *ToCltAddParticleSpawner) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } if err := pcall(func() { ((*(*(struct { @@ -7158,7 +7110,6 @@ func (obj *ToCltAddParticleSpawner) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } if err := pcall(func() { ((*(*(struct { @@ -11026,7 +10977,6 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA }))(obj)).BgColor w.Write([]byte{x.A, x.R, x.G, x.B}) - } if len(([]byte((*(*(struct { BgColor color.NRGBA @@ -11110,7 +11060,6 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -11131,7 +11080,6 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA }))(obj)).SunFogTint w.Write([]byte{x.A, x.R, x.G, x.B}) - } { x := (*(*(struct { @@ -11152,7 +11100,6 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA }))(obj)).MoonFogTint w.Write([]byte{x.A, x.R, x.G, x.B}) - } if len(([]byte((*(*(struct { BgColor color.NRGBA @@ -11348,7 +11295,6 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA }))(obj)).DaySky w.Write([]byte{x.A, x.R, x.G, x.B}) - } { x := (*(*(struct { @@ -11369,7 +11315,6 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA }))(obj)).DayHorizon w.Write([]byte{x.A, x.R, x.G, x.B}) - } { x := (*(*(struct { @@ -11390,7 +11335,6 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA }))(obj)).DawnSky w.Write([]byte{x.A, x.R, x.G, x.B}) - } { x := (*(*(struct { @@ -11411,7 +11355,6 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA }))(obj)).DawnHorizon w.Write([]byte{x.A, x.R, x.G, x.B}) - } { x := (*(*(struct { @@ -11432,7 +11375,6 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA }))(obj)).NightSky w.Write([]byte{x.A, x.R, x.G, x.B}) - } { x := (*(*(struct { @@ -11453,7 +11395,6 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA }))(obj)).NightHorizon w.Write([]byte{x.A, x.R, x.G, x.B}) - } { x := (*(*(struct { @@ -11474,7 +11415,6 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA }))(obj)).Indoor w.Write([]byte{x.A, x.R, x.G, x.B}) - } } } @@ -11499,7 +11439,6 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA }))(obj)).BgColor *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} - } var local192 []uint8 var local193 uint16 @@ -11555,7 +11494,6 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -11576,7 +11514,6 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA }))(obj)).SunFogTint *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} - } { p := &(*(*(struct { @@ -11597,7 +11534,6 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA }))(obj)).MoonFogTint *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} - } var local194 []uint8 var local195 uint16 @@ -11745,7 +11681,6 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA }))(obj)).DaySky *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} - } { p := &(*(*(struct { @@ -11766,7 +11701,6 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA }))(obj)).DayHorizon *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} - } { p := &(*(*(struct { @@ -11787,7 +11721,6 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA }))(obj)).DawnSky *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} - } { p := &(*(*(struct { @@ -11808,7 +11741,6 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA }))(obj)).DawnHorizon *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} - } { p := &(*(*(struct { @@ -11829,7 +11761,6 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA }))(obj)).NightSky *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} - } { p := &(*(*(struct { @@ -11850,7 +11781,6 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA }))(obj)).NightHorizon *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} - } { p := &(*(*(struct { @@ -11871,7 +11801,6 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA }))(obj)).Indoor *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} - } } } @@ -11887,7 +11816,6 @@ func (obj *ToCltOverrideDayNightRatio) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -11912,7 +11840,6 @@ func (obj *ToCltOverrideDayNightRatio) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -12133,7 +12060,6 @@ func (obj *ToCltCloudParams) serialize(w io.Writer) { Speed [2]float32 }))(obj)).DiffuseColor w.Write([]byte{x.A, x.R, x.G, x.B}) - } { x := (*(*(struct { @@ -12145,7 +12071,6 @@ func (obj *ToCltCloudParams) serialize(w io.Writer) { Speed [2]float32 }))(obj)).AmbientColor w.Write([]byte{x.A, x.R, x.G, x.B}) - } { x := (*(*(struct { @@ -12213,7 +12138,6 @@ func (obj *ToCltCloudParams) deserialize(r io.Reader) { Speed [2]float32 }))(obj)).DiffuseColor *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} - } { p := &(*(*(struct { @@ -12225,7 +12149,6 @@ func (obj *ToCltCloudParams) deserialize(r io.Reader) { Speed [2]float32 }))(obj)).AmbientColor *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} - } { p := &(*(*(struct { @@ -12625,7 +12548,6 @@ func (obj *ToCltNodeMetasChanged) serialize(w io.Writer) { }))(obj)).Changed { w := zlib.NewWriter(w) - if x == nil { write8(w, 0) } else { @@ -12640,7 +12562,6 @@ func (obj *ToCltNodeMetasChanged) serialize(w io.Writer) { } sort.Slice(keys, func(i, j int) bool { p, q := keys[i], keys[j] - for i := range p { switch { case p[i] < q[i]: @@ -12649,7 +12570,6 @@ func (obj *ToCltNodeMetasChanged) serialize(w io.Writer) { return false } } - return false }) for _, key := range keys { @@ -12659,10 +12579,8 @@ func (obj *ToCltNodeMetasChanged) serialize(w io.Writer) { chk(serialize(w, x[key])) } } - chk(w.Close()) } - } { buf := w @@ -12698,7 +12616,6 @@ func (obj *ToCltNodeMetasChanged) deserialize(r io.Reader) { { r, err := zlib.NewReader(byteReader{r}) chk(err) - switch ver := read8(r); ver { case 0: *p = nil @@ -12717,10 +12634,8 @@ func (obj *ToCltNodeMetasChanged) deserialize(r io.Reader) { default: chk(fmt.Errorf("unsupported nodemetas version: %d", ver)) } - chk(r.Close()) } - } if r.N > 0 { chk(fmt.Errorf("%d bytes of trailing data", r.N)) @@ -12743,7 +12658,6 @@ func (obj *ToCltSunParams) serialize(w io.Writer) { } else { write8(w, 0) } - } if err := pcall(func() { ((*(*(struct { @@ -12804,7 +12718,6 @@ func (obj *ToCltSunParams) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -12837,7 +12750,6 @@ func (obj *ToCltSunParams) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } if err := pcall(func() { ((*(*(struct { @@ -12901,7 +12813,6 @@ func (obj *ToCltSunParams) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -12929,7 +12840,6 @@ func (obj *ToCltMoonParams) serialize(w io.Writer) { } else { write8(w, 0) } - } if err := pcall(func() { ((*(*(struct { @@ -12984,7 +12894,6 @@ func (obj *ToCltMoonParams) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } if err := pcall(func() { ((*(*(struct { @@ -13036,7 +12945,6 @@ func (obj *ToCltStarParams) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -13055,7 +12963,6 @@ func (obj *ToCltStarParams) serialize(w io.Writer) { Size float32 }))(obj)).Color w.Write([]byte{x.A, x.R, x.G, x.B}) - } { x := (*(*(struct { @@ -13084,7 +12991,6 @@ func (obj *ToCltStarParams) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -13103,7 +13009,6 @@ func (obj *ToCltStarParams) deserialize(r io.Reader) { Size float32 }))(obj)).Color *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} - } { p := &(*(*(struct { @@ -15339,7 +15244,6 @@ func (obj *NodeDef) serialize(w io.Writer) { AlphaUse }))(obj)).Color w.Write([]byte{x.A, x.R, x.G, x.B}) - } if err := pcall(func() { ((*(*(struct { @@ -15877,7 +15781,6 @@ func (obj *NodeDef) serialize(w io.Writer) { AlphaUse }))(obj)).InsideTint w.Write([]byte{x.A, x.R, x.G, x.B}) - } { x := (*(*(struct { @@ -16014,7 +15917,6 @@ func (obj *NodeDef) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -16085,7 +15987,6 @@ func (obj *NodeDef) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -16222,7 +16123,6 @@ func (obj *NodeDef) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -16293,7 +16193,6 @@ func (obj *NodeDef) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -16364,7 +16263,6 @@ func (obj *NodeDef) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -16435,7 +16333,6 @@ func (obj *NodeDef) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -16506,7 +16403,6 @@ func (obj *NodeDef) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -16577,7 +16473,6 @@ func (obj *NodeDef) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -16648,7 +16543,6 @@ func (obj *NodeDef) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -17315,7 +17209,6 @@ func (obj *NodeDef) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -17518,7 +17411,6 @@ func (obj *NodeDef) serialize(w io.Writer) { } else { write8(w, 0) } - } if err := pcall(func() { ((*(*(struct { @@ -18009,7 +17901,6 @@ func (obj *NodeDef) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -18080,7 +17971,6 @@ func (obj *NodeDef) serialize(w io.Writer) { } else { write8(w, 0) } - } if len(([]byte((*(*(struct { Param0 Content @@ -19637,7 +19527,6 @@ func (obj *NodeDef) deserialize(r io.Reader) { AlphaUse }))(obj)).Color *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} - } if err := pcall(func() { ((*(*(struct { @@ -20112,7 +20001,6 @@ func (obj *NodeDef) deserialize(r io.Reader) { AlphaUse }))(obj)).InsideTint *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} - } { p := &(*(*(struct { @@ -20252,7 +20140,6 @@ func (obj *NodeDef) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -20326,7 +20213,6 @@ func (obj *NodeDef) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -20466,7 +20352,6 @@ func (obj *NodeDef) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -20540,7 +20425,6 @@ func (obj *NodeDef) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -20614,7 +20498,6 @@ func (obj *NodeDef) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -20688,7 +20571,6 @@ func (obj *NodeDef) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -20762,7 +20644,6 @@ func (obj *NodeDef) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -20836,7 +20717,6 @@ func (obj *NodeDef) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -20910,7 +20790,6 @@ func (obj *NodeDef) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -21334,7 +21213,6 @@ func (obj *NodeDef) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -21540,7 +21418,6 @@ func (obj *NodeDef) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } if err := pcall(func() { ((*(*(struct { @@ -22034,7 +21911,6 @@ func (obj *NodeDef) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -22108,7 +21984,6 @@ func (obj *NodeDef) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } var local267 []uint8 var local268 uint16 @@ -22896,7 +22771,6 @@ func (obj *MapBlk) serialize(w io.Writer) { }))(obj)).NodeMetas { w := zlib.NewWriter(w) - if x == nil { write8(w, 0) } else { @@ -22911,9 +22785,7 @@ func (obj *MapBlk) serialize(w io.Writer) { i2pos := func(i int) [3]int16 { return Blkpos2Pos([3]int16{}, keys[i]) } - p, q := i2pos(i), i2pos(j) - for i := range p { switch { case p[i] < q[i]: @@ -22922,7 +22794,6 @@ func (obj *MapBlk) serialize(w io.Writer) { return false } } - return false }) for _, key := range keys { @@ -22930,10 +22801,8 @@ func (obj *MapBlk) serialize(w io.Writer) { chk(serialize(w, x[key])) } } - chk(w.Close()) } - } { local284 := uint8(2) // version @@ -23081,7 +22950,6 @@ func (obj *MapBlk) deserialize(r io.Reader) { { r, err := zlib.NewReader(byteReader{r}) chk(err) - switch ver := read8(r); ver { case 0: *p = nil @@ -23097,10 +22965,8 @@ func (obj *MapBlk) deserialize(r io.Reader) { default: chk(fmt.Errorf("unsupported nodemetas version: %d", ver)) } - chk(r.Close()) } - } { var local290 uint8 @@ -23175,7 +23041,6 @@ func (obj *CSMRestrictionFlags) serialize(w io.Writer) { { x := *(*(uint64))(obj) write64(w, uint64(x)) - } } @@ -23183,7 +23048,6 @@ func (obj *CSMRestrictionFlags) deserialize(r io.Reader) { { p := &*(*(uint64))(obj) *p = read64(r) - } } @@ -23370,7 +23234,6 @@ func (obj *IDAOMsg) serialize(w io.Writer) { Msg AOMsg }))(obj)).Msg writeAOMsg(w, x) - } { buf := w @@ -23421,7 +23284,6 @@ func (obj *IDAOMsg) deserialize(r io.Reader) { *p, err = readAOMsg(r) chk(err) } - } if r.N > 0 { chk(fmt.Errorf("%d bytes of trailing data", r.N)) @@ -23919,7 +23781,6 @@ func (obj *ItemDef) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -23960,7 +23821,6 @@ func (obj *ItemDef) serialize(w io.Writer) { } else { write8(w, 0) } - } if err := pcall(func() { ((*(*(struct { @@ -24445,7 +24305,6 @@ func (obj *ItemDef) serialize(w io.Writer) { ShortDesc string }))(obj)).Color w.Write([]byte{x.A, x.R, x.G, x.B}) - } if err := pcall(func() { ((*(*(struct { @@ -25027,7 +24886,6 @@ func (obj *ItemDef) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -25071,7 +24929,6 @@ func (obj *ItemDef) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } if err := pcall(func() { ((*(*(struct { @@ -25460,7 +25317,6 @@ func (obj *ItemDef) deserialize(r io.Reader) { ShortDesc string }))(obj)).Color *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} - } if err := pcall(func() { ((*(*(struct { @@ -27023,7 +26879,6 @@ func (obj *AOProps) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -27192,7 +27047,6 @@ func (obj *AOProps) serialize(w io.Writer) { } else { write8(w, 0) } - } if len(([]byte((*(*(struct { MaxHP uint16 // Player only. @@ -27737,7 +27591,6 @@ func (obj *AOProps) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -27781,7 +27634,6 @@ func (obj *AOProps) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -28089,7 +27941,6 @@ func (obj *AOProps) serialize(w io.Writer) { NametagBG color.NRGBA }))(obj)).Colors)[local338] w.Write([]byte{x.A, x.R, x.G, x.B}) - } } { @@ -28134,7 +27985,6 @@ func (obj *AOProps) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -28217,7 +28067,6 @@ func (obj *AOProps) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -28300,7 +28149,6 @@ func (obj *AOProps) serialize(w io.Writer) { } else { write8(w, 0) } - } if len(([]byte((*(*(struct { MaxHP uint16 // Player only. @@ -28456,7 +28304,6 @@ func (obj *AOProps) serialize(w io.Writer) { NametagBG color.NRGBA }))(obj)).NametagColor w.Write([]byte{x.A, x.R, x.G, x.B}) - } { x := (*(*(struct { @@ -28927,7 +28774,6 @@ func (obj *AOProps) serialize(w io.Writer) { } else { write8(w, 0) } - } if err := pcall(func() { ((*(*(struct { @@ -29014,7 +28860,6 @@ func (obj *AOProps) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -29058,7 +28903,6 @@ func (obj *AOProps) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -29098,7 +28942,6 @@ func (obj *AOProps) serialize(w io.Writer) { NametagBG color.NRGBA }))(obj)).NametagBG w.Write([]byte{x.A, x.R, x.G, x.B}) - } } @@ -29198,7 +29041,6 @@ func (obj *AOProps) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -29370,7 +29212,6 @@ func (obj *AOProps) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } var local341 []uint8 var local342 uint16 @@ -29813,7 +29654,6 @@ func (obj *AOProps) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -29860,7 +29700,6 @@ func (obj *AOProps) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -30063,7 +29902,6 @@ func (obj *AOProps) deserialize(r io.Reader) { NametagBG color.NRGBA }))(obj)).Colors)[local351] *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} - } } { @@ -30111,7 +29949,6 @@ func (obj *AOProps) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -30197,7 +30034,6 @@ func (obj *AOProps) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -30283,7 +30119,6 @@ func (obj *AOProps) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } var local352 []uint8 var local353 uint16 @@ -30370,7 +30205,6 @@ func (obj *AOProps) deserialize(r io.Reader) { NametagBG color.NRGBA }))(obj)).NametagColor *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} - } { p := &(*(*(struct { @@ -30706,7 +30540,6 @@ func (obj *AOProps) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } if err := pcall(func() { ((*(*(struct { @@ -30796,7 +30629,6 @@ func (obj *AOProps) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -30843,7 +30675,6 @@ func (obj *AOProps) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -30883,7 +30714,6 @@ func (obj *AOProps) deserialize(r io.Reader) { NametagBG color.NRGBA }))(obj)).NametagBG *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} - } } @@ -30973,7 +30803,6 @@ func (obj *AOPos) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -30990,7 +30819,6 @@ func (obj *AOPos) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -31095,7 +30923,6 @@ func (obj *AOPos) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -31115,7 +30942,6 @@ func (obj *AOPos) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -31178,7 +31004,6 @@ func (obj *AOSprite) serialize(w io.Writer) { } else { write8(w, 0) } - } } @@ -31232,7 +31057,6 @@ func (obj *AOSprite) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } } @@ -31338,7 +31162,6 @@ func (obj *AOAnim) serialize(w io.Writer) { } else { write8(w, 0) } - } } @@ -31392,7 +31215,6 @@ func (obj *AOAnim) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } } @@ -31537,7 +31359,6 @@ func (obj *AOAttach) serialize(w io.Writer) { } else { write8(w, 0) } - } } @@ -31622,7 +31443,6 @@ func (obj *AOAttach) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } } @@ -31666,7 +31486,6 @@ func (obj *AOPhysOverride) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -31680,7 +31499,6 @@ func (obj *AOPhysOverride) serialize(w io.Writer) { } else { write8(w, 0) } - } { x := (*(*(struct { @@ -31694,7 +31512,6 @@ func (obj *AOPhysOverride) serialize(w io.Writer) { } else { write8(w, 0) } - } } @@ -31741,7 +31558,6 @@ func (obj *AOPhysOverride) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -31758,7 +31574,6 @@ func (obj *AOPhysOverride) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } { p := &(*(*(struct { @@ -31775,7 +31590,6 @@ func (obj *AOPhysOverride) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } } @@ -31815,7 +31629,6 @@ func (obj *NodeMetaField) serialize(w io.Writer) { } else { write8(w, 0) } - } } @@ -31844,7 +31657,6 @@ func (obj *NodeMetaField) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } } @@ -33304,7 +33116,6 @@ func (obj *AOInitData) serialize(w io.Writer) { } else { write8(w, 0) } - } if err := pcall(func() { ((*(*(struct { @@ -33440,7 +33251,6 @@ func (obj *AOInitData) serialize(w io.Writer) { chk(err) } } - } } @@ -33508,7 +33318,6 @@ func (obj *AOInitData) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } if err := pcall(func() { ((*(*(struct { @@ -33640,7 +33449,6 @@ func (obj *AOInitData) deserialize(r io.Reader) { } } } - } } @@ -33697,7 +33505,6 @@ func (obj *ToolCaps) serialize(w io.Writer) { } else { write8(w, 0) } - } } { @@ -34016,7 +33823,6 @@ func (obj *ToolCaps) deserialize(r io.Reader) { default: chk(fmt.Errorf("invalid bool: %d", n)) } - } } { -- 2.44.0