use mt-types pkg

BuckarooBanzay · BuckarooBanzay · commit c58dd9a98054 · 2024-08-23T13:45:28.000+02:00
diff --git a/commandclient/debughandler.go b/commandclient/debughandler.go
@@ -19,7 +19,7 @@ func DebugHandler(cc *CommandClient) error {
 			gotblocks := commands.NewClientGotBlocks()
 			gotblocks.AddBlock(cmd.Pos)
 
-			//fmt.Printf("Got block: %s\n", cmd.Pos)
+			fmt.Printf("Got block: %s\n", &cmd.Pos)
 			err := cc.SendCommand(gotblocks)
 			if err != nil {
 				return err
diff --git a/commands/client_got_blocks.go b/commands/client_got_blocks.go
@@ -4,29 +4,25 @@ import (
 	"encoding/binary"
 	"fmt"
 
-	"github.com/minetest-go/minetest_client/types"
+	"github.com/minetest-go/types"
 )
 
 type ClientGotBlocks struct {
-	Blocks []types.BlockPos
+	Blocks []types.Pos
 }
 
 func NewClientGotBlocks() *ClientGotBlocks {
 	return &ClientGotBlocks{
-		Blocks: make([]types.BlockPos, 0),
+		Blocks: make([]types.Pos, 0),
 	}
 }
 
-func (p *ClientGotBlocks) AddBlock(pos types.BlockPos) {
+func (p *ClientGotBlocks) AddBlock(pos types.Pos) {
 	p.Blocks = append(p.Blocks, pos)
 }
 
-func (p *ClientGotBlocks) AddBlockPos(x, y, z int16) {
-	p.AddBlock(types.BlockPos{
-		PosX: x,
-		PosY: y,
-		PosZ: z,
-	})
+func (p *ClientGotBlocks) AddBlockPos(x, y, z int) {
+	p.AddBlock(types.Pos{x, y, z})
 }
 
 func (p *ClientGotBlocks) GetCommandId() uint16 {
@@ -38,11 +34,11 @@ func (p *ClientGotBlocks) MarshalPacket() ([]byte, error) {
 	buf[0] = uint8(len(p.Blocks))
 	offset := 1
 	for _, bp := range p.Blocks {
-		binary.BigEndian.PutUint16(buf[offset:], uint16(bp.PosX))
+		binary.BigEndian.PutUint16(buf[offset:], uint16(bp.X()))
 		offset += 2
-		binary.BigEndian.PutUint16(buf[offset:], uint16(bp.PosY))
+		binary.BigEndian.PutUint16(buf[offset:], uint16(bp.Y()))
 		offset += 2
-		binary.BigEndian.PutUint16(buf[offset:], uint16(bp.PosZ))
+		binary.BigEndian.PutUint16(buf[offset:], uint16(bp.Z()))
 		offset += 2
 	}
 
@@ -54,5 +50,5 @@ func (p *ClientGotBlocks) UnmarshalPacket([]byte) error {
 }
 
 func (p *ClientGotBlocks) String() string {
-	return fmt.Sprintf("{ClientGotBlocks blocks=%s}", p.Blocks)
+	return fmt.Sprintf("{ClientGotBlocks blocks=%v}", p.Blocks)
 }
diff --git a/commands/server_block_data.go b/commands/server_block_data.go
@@ -4,11 +4,11 @@ import (
 	"encoding/binary"
 	"fmt"
 
-	"github.com/minetest-go/minetest_client/types"
+	"github.com/minetest-go/types"
 )
 
 type ServerBlockData struct {
-	Pos types.BlockPos
+	Pos types.Pos
 }
 
 func (p *ServerBlockData) GetCommandId() uint16 {
@@ -20,14 +20,15 @@ func (p *ServerBlockData) MarshalPacket() ([]byte, error) {
 }
 
 func (p *ServerBlockData) UnmarshalPacket(payload []byte) error {
-	blockpos := types.BlockPos{}
-	blockpos.PosX = int16(binary.BigEndian.Uint16(payload[0:]))
-	blockpos.PosY = int16(binary.BigEndian.Uint16(payload[2:]))
-	blockpos.PosZ = int16(binary.BigEndian.Uint16(payload[4:]))
+	blockpos := types.Pos{
+		int(int16(binary.BigEndian.Uint16(payload[0:]))),
+		int(int16(binary.BigEndian.Uint16(payload[2:]))),
+		int(int16(binary.BigEndian.Uint16(payload[4:]))),
+	}
 	p.Pos = blockpos
 	return nil
 }
 
 func (p *ServerBlockData) String() string {
-	return fmt.Sprintf("{ServerBlockData pos=%s}", p.Pos)
+	return fmt.Sprintf("{ServerBlockData pos=%s}", &p.Pos)
 }
diff --git a/commands/server_block_data_test.go b/commands/server_block_data_test.go
@@ -25,7 +25,7 @@ func TestServerBlockData(t *testing.T) {
 	err = pkg.UnmarshalPacket(payload[0x37:])
 	assert.NoError(t, err)
 
-	assert.Equal(t, int16(32), pkg.Pos.PosX)
-	assert.Equal(t, int16(-2), pkg.Pos.PosY)
-	assert.Equal(t, int16(12), pkg.Pos.PosZ)
+	assert.Equal(t, 32, pkg.Pos.X())
+	assert.Equal(t, -2, pkg.Pos.Y())
+	assert.Equal(t, 12, pkg.Pos.Z())
 }
diff --git a/go.mod b/go.mod
@@ -1,12 +1,16 @@
 module github.com/minetest-go/minetest_client
 
-go 1.22
+go 1.22.4
 
-require github.com/stretchr/testify v1.7.1
+toolchain go1.23.0
+
+require github.com/stretchr/testify v1.9.0
+
+require github.com/minetest-go/types v1.0.4
 
 require (
-	github.com/davecgh/go-spew v1.1.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	golang.org/x/text v0.3.7
-	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -1,14 +1,14 @@
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/minetest-go/types v1.0.4 h1:SuM1UPXM2ocngJqZwlxZjnQVJEFxeMyk4bqlEw1BAj4=
+github.com/minetest-go/types v1.0.4/go.mod h1:QS2q8tKAiuBe2Rin880ARFt9VokYIJNZV4Z4kHAChU0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/types/blockpos.go b/types/blockpos.go

Original file line number	Diff line number	Diff line change
`@@ -4,29 +4,25 @@ import (`
`4`	`4`	`"encoding/binary"`
`5`	`5`	`"fmt"`
`6`	`6`
`7`		`- "github.com/minetest-go/minetest_client/types"`
	`7`	`+ "github.com/minetest-go/types"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`type ClientGotBlocks struct {`
`11`		`- Blocks []types.BlockPos`
	`11`	`+ Blocks []types.Pos`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`func NewClientGotBlocks() *ClientGotBlocks {`
`15`	`15`	`return &ClientGotBlocks{`
`16`		`- Blocks: make([]types.BlockPos, 0),`
	`16`	`+ Blocks: make([]types.Pos, 0),`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`
`20`		`-func (p *ClientGotBlocks) AddBlock(pos types.BlockPos) {`
	`20`	`+func (p *ClientGotBlocks) AddBlock(pos types.Pos) {`
`21`	`21`	`p.Blocks = append(p.Blocks, pos)`
`22`	`22`	`}`
`23`	`23`
`24`		`-func (p *ClientGotBlocks) AddBlockPos(x, y, z int16) {`
`25`		`- p.AddBlock(types.BlockPos{`
`26`		`- PosX: x,`
`27`		`- PosY: y,`
`28`		`- PosZ: z,`
`29`		`- })`
	`24`	`+func (p *ClientGotBlocks) AddBlockPos(x, y, z int) {`
	`25`	`+ p.AddBlock(types.Pos{x, y, z})`
`30`	`26`	`}`
`31`	`27`
`32`	`28`	`func (p *ClientGotBlocks) GetCommandId() uint16 {`
`@@ -38,11 +34,11 @@ func (p *ClientGotBlocks) MarshalPacket() ([]byte, error) {`
`38`	`34`	`buf[0] = uint8(len(p.Blocks))`
`39`	`35`	`offset := 1`
`40`	`36`	`for _, bp := range p.Blocks {`
`41`		`- binary.BigEndian.PutUint16(buf[offset:], uint16(bp.PosX))`
	`37`	`+ binary.BigEndian.PutUint16(buf[offset:], uint16(bp.X()))`
`42`	`38`	`offset += 2`
`43`		`- binary.BigEndian.PutUint16(buf[offset:], uint16(bp.PosY))`
	`39`	`+ binary.BigEndian.PutUint16(buf[offset:], uint16(bp.Y()))`
`44`	`40`	`offset += 2`
`45`		`- binary.BigEndian.PutUint16(buf[offset:], uint16(bp.PosZ))`
	`41`	`+ binary.BigEndian.PutUint16(buf[offset:], uint16(bp.Z()))`
`46`	`42`	`offset += 2`
`47`	`43`	`}`
`48`	`44`
`@@ -54,5 +50,5 @@ func (p *ClientGotBlocks) UnmarshalPacket([]byte) error {`
`54`	`50`	`}`
`55`	`51`
`56`	`52`	`func (p *ClientGotBlocks) String() string {`
`57`		`- return fmt.Sprintf("{ClientGotBlocks blocks=%s}", p.Blocks)`
	`53`	`+ return fmt.Sprintf("{ClientGotBlocks blocks=%v}", p.Blocks)`
`58`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,11 @@ import (`
`4`	`4`	`"encoding/binary"`
`5`	`5`	`"fmt"`
`6`	`6`
`7`		`- "github.com/minetest-go/minetest_client/types"`
	`7`	`+ "github.com/minetest-go/types"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`type ServerBlockData struct {`
`11`		`- Pos types.BlockPos`
	`11`	`+ Pos types.Pos`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`func (p *ServerBlockData) GetCommandId() uint16 {`
`@@ -20,14 +20,15 @@ func (p *ServerBlockData) MarshalPacket() ([]byte, error) {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`func (p *ServerBlockData) UnmarshalPacket(payload []byte) error {`
`23`		`- blockpos := types.BlockPos{}`
`24`		`- blockpos.PosX = int16(binary.BigEndian.Uint16(payload[0:]))`
`25`		`- blockpos.PosY = int16(binary.BigEndian.Uint16(payload[2:]))`
`26`		`- blockpos.PosZ = int16(binary.BigEndian.Uint16(payload[4:]))`
	`23`	`+ blockpos := types.Pos{`
	`24`	`+ int(int16(binary.BigEndian.Uint16(payload[0:]))),`
	`25`	`+ int(int16(binary.BigEndian.Uint16(payload[2:]))),`
	`26`	`+ int(int16(binary.BigEndian.Uint16(payload[4:]))),`
	`27`	`+ }`
`27`	`28`	`p.Pos = blockpos`
`28`	`29`	`return nil`
`29`	`30`	`}`
`30`	`31`
`31`	`32`	`func (p *ServerBlockData) String() string {`
`32`		`- return fmt.Sprintf("{ServerBlockData pos=%s}", p.Pos)`
	`33`	`+ return fmt.Sprintf("{ServerBlockData pos=%s}", &p.Pos)`
`33`	`34`	`}`