format repo with "gofumpt" tool

examples/autofish/autofish.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	botchat "github.com/Tnze/go-mc/bot/chat"
 	"log"
 	"time"
 
@@ -9,6 +8,7 @@ import (
 
 	"github.com/Tnze/go-mc/bot"
 	"github.com/Tnze/go-mc/bot/basic"
+	botchat "github.com/Tnze/go-mc/bot/chat"
 	"github.com/Tnze/go-mc/chat"
 	_ "github.com/Tnze/go-mc/data/lang/en-us"
 	"github.com/Tnze/go-mc/data/packetid"
@@ -26,7 +26,7 @@ var (
 )
 
 func main() {
-	//log.SetOutput(colorable.NewColorableStdout()) // optional for colorable output
+	// log.SetOutput(colorable.NewColorableStdout()) // optional for colorable output
 	c = bot.NewClient()
 	p = basic.NewPlayer(c, basic.DefaultSettings, basic.EventsListener{
 		GameStart:  onGameStart,
@@ -36,18 +36,18 @@ func main() {
 	})
 	bc = botchat.NewChat(c, p, botchat.EventsHandler{PlayerChatMessage: onChatMsg})
 
-	//Register event handlers
+	// Register event handlers
 
 	c.Events.AddListener(soundListener)
 
-	//Login
+	// Login
 	err := c.JoinServer("127.0.0.1")
 	if err != nil {
 		log.Fatal(err)
 	}
 	log.Println("Login success")
 
-	//JoinGame
+	// JoinGame
 	err = c.HandleGame()
 	if err != nil {
 		log.Fatal(err)
@@ -96,12 +96,12 @@ func UseItem(hand int32) error {
 //goland:noinspection SpellCheckingInspection
 func onSound(id int, category int, x, y, z float64, volume, pitch float32) error {
 	if id == 369 {
-		if err := UseItem(0); err != nil { //retrieve
+		if err := UseItem(0); err != nil { // retrieve
 			return err
 		}
 		log.Println("gra~")
 		time.Sleep(time.Millisecond * 300)
-		if err := UseItem(0); err != nil { //throw
+		if err := UseItem(0); err != nil { // throw
 			return err
 		}
 		watch <- time.Now()

examples/daze/daze.go

@@ -21,20 +21,24 @@ import (
 	"github.com/Tnze/go-mc/level"
 )
 
-var address = flag.String("address", "127.0.0.1", "The server address")
-var name = flag.String("name", "Daze", "The player's name")
-var playerID = flag.String("uuid", "", "The player's UUID")
-var accessToken = flag.String("token", "", "AccessToken")
+var (
+	address     = flag.String("address", "127.0.0.1", "The server address")
+	name        = flag.String("name", "Daze", "The player's name")
+	playerID    = flag.String("uuid", "", "The player's UUID")
+	accessToken = flag.String("token", "", "AccessToken")
+)
 
-var client *bot.Client
-var player *basic.Player
-var chatHandler *botchat.Chat
-var worldManager *world.World
-var screenManager *screen.Manager
+var (
+	client        *bot.Client
+	player        *basic.Player
+	chatHandler   *botchat.Chat
+	worldManager  *world.World
+	screenManager *screen.Manager
+)
 
 func main() {
 	flag.Parse()
-	//log.SetOutput(colorable.NewColorableStdout())
+	// log.SetOutput(colorable.NewColorableStdout())
 	client = bot.NewClient()
 	client.Auth = bot.Auth{
 		Name: *name,
@@ -61,14 +65,14 @@ func main() {
 		Close:   nil,
 	})
 
-	//Login
+	// Login
 	err := client.JoinServer(*address)
 	if err != nil {
 		log.Fatal(err)
 	}
 	log.Println("Login success")
 
-	//JoinGame
+	// JoinGame
 	for {
 		if err = client.HandleGame(); err == nil {
 			panic("HandleGame never return nil")
@@ -103,7 +107,7 @@ func onDeath() error {
 
 func onGameStart() error {
 	log.Println("Game start")
-	return nil //if err isn't nil, HandleGame() will return it.
+	return nil // if err isn't nil, HandleGame() will return it.
 }
 
 func onPlayerMsg(msg chat.Message) error {

examples/dazeReadCommand/daze.go

@@ -18,14 +18,16 @@ import (
 	pk "github.com/Tnze/go-mc/net/packet"
 )
 
-var address = flag.String("address", "127.0.0.1", "The server address")
-var client *bot.Client
-var player *basic.Player
-var screenManager *screen.Manager
+var (
+	address       = flag.String("address", "127.0.0.1", "The server address")
+	client        *bot.Client
+	player        *basic.Player
+	screenManager *screen.Manager
+)
 
 func main() {
 	flag.Parse()
-	//log.SetOutput(colorable.NewColorableStdout())
+	// log.SetOutput(colorable.NewColorableStdout())
 	client = bot.NewClient()
 	client.Auth.Name = "Daze"
 	player = basic.NewPlayer(client, basic.DefaultSettings, basic.EventsListener{})
@@ -35,14 +37,14 @@ func main() {
 		F:        onCommands,
 	})
 
-	//Login
+	// Login
 	err := client.JoinServer(*address)
 	if err != nil {
 		log.Fatal(err)
 	}
 	log.Println("Login success")
 
-	//JoinGame
+	// JoinGame
 	for {
 		if err = client.HandleGame(); err == nil {
 			panic("HandleGame never return nil")
@@ -62,8 +64,7 @@ func onCommands(p pk.Packet) error {
 	return nil
 }
 
-type Node struct {
-}
+type Node struct{}
 
 func (n Node) ReadFrom(r io.Reader) (int64, error) {
 	var Flags pk.Byte
@@ -71,7 +72,7 @@ func (n Node) ReadFrom(r io.Reader) (int64, error) {
 	var Redirect pk.VarInt
 	var Name pk.String
 	var Parser pk.Identifier
-	var Properties = Prop{Type: &Parser}
+	Properties := Prop{Type: &Parser}
 	var SuggestionsType pk.Identifier
 	m, err := pk.Tuple{
 		&Flags,

examples/luncher/luncher.go

@@ -8,8 +8,10 @@ import (
 	"github.com/Tnze/go-mc/yggdrasil"
 )
 
-var user = flag.String("user", "", "Can be an email address or player name for unmigrated accounts")
-var pswd = flag.String("password", "", "Your password")
+var (
+	user = flag.String("user", "", "Can be an email address or player name for unmigrated accounts")
+	pswd = flag.String("password", "", "Your password")
+)
 
 func main() {
 	flag.Parse()

examples/mcadump/mcadump.go

@@ -13,8 +13,10 @@ import (
 	"github.com/Tnze/go-mc/save/region"
 )
 
-var decomp = flag.Bool("x", false, "decompress each chunk to NBT format")
-var repack = flag.Bool("p", false, "repack .mcc file to .mca")
+var (
+	decomp = flag.Bool("x", false, "decompress each chunk to NBT format")
+	repack = flag.Bool("p", false, "repack .mcc file to .mca")
+)
 
 func main() {
 	flag.Usage = usage
@@ -79,7 +81,7 @@ func unpack(f, o string) {
 
 			fn := fmt.Sprintf("c.%d.%d.mcc", x*32+i, z*32+j)
 			if *decomp {
-				fn += ".nbt" //解压后就是一个标准的NBT文件，可以加个.nbt后缀
+				fn += ".nbt" // 解压后就是一个标准的NBT文件，可以加个.nbt后缀
 				switch data[0] {
 				default:
 					err = fmt.Errorf("unknown compression type 0x%02x", data[0])
@@ -91,7 +93,7 @@ func unpack(f, o string) {
 				checkerr(err)
 			}
 
-			cf, err := os.OpenFile(filepath.Join(o, fn), os.O_CREATE|os.O_RDWR|os.O_EXCL, 0666)
+			cf, err := os.OpenFile(filepath.Join(o, fn), os.O_CREATE|os.O_RDWR|os.O_EXCL, 0o666)
 			checkerr(err)
 
 			_, err = io.Copy(cf, r)

examples/mcping/mcping.go

@@ -20,8 +20,10 @@ import (
 	"github.com/Tnze/go-mc/chat"
 )
 
-var protocol = flag.Int("p", 578, "The protocol version number sent during ping")
-var favicon = flag.String("f", "", "If specified, the server's icon will be save to")
+var (
+	protocol = flag.Int("p", 578, "The protocol version number sent during ping")
+	favicon  = flag.String("f", "", "If specified, the server's icon will be save to")
+)
 
 type status struct {
 	Description chat.Message

examples/pressureTest/main.go

@@ -13,12 +13,14 @@ import (
 	"github.com/Tnze/go-mc/chat"
 )
 
-var address = flag.String("address", "127.0.0.1", "The server address")
-var number = flag.Int("number", 1023, "The number of clients")
+var (
+	address = flag.String("address", "127.0.0.1", "The server address")
+	number  = flag.Int("number", 1023, "The number of clients")
+)
 
 func main() {
 	flag.Parse()
-	//log.SetOutput(colorable.NewColorableStdout())
+	// log.SetOutput(colorable.NewColorableStdout())
 
 	for i := 0; i < *number; i++ {
 		go func(i int) {
@@ -52,7 +54,7 @@ func newIndividual(id int, name string) (i *individual) {
 }
 
 func (i *individual) run(address string) {
-	//Login
+	// Login
 	err := i.client.JoinServer(address)
 	if err != nil {
 		log.Printf("[%d]Login fail: %v", i.id, err)
@@ -60,7 +62,7 @@ func (i *individual) run(address string) {
 	}
 	log.Printf("[%d]Login success", i.id)
 
-	//JoinGame
+	// JoinGame
 	if err = i.client.HandleGame(); err == nil {
 		panic("HandleGame never return nil")
 	}

examples/simpleServer1.15.2/main.go

@@ -11,8 +11,10 @@ import (
 	"github.com/Tnze/go-mc/offline"
 )
 
-const ProtocolVersion = 578
-const MaxPlayer = 200
+const (
+	ProtocolVersion = 578
+	MaxPlayer       = 200
+)
 
 // Packet IDs
 const (
@@ -45,11 +47,11 @@ func acceptConn(conn net.Conn) {
 	}
 
 	switch intention {
-	default: //unknown error
+	default: // unknown error
 		log.Printf("Unknown handshake intention: %v", intention)
-	case 1: //for status
+	case 1: // for status
 		acceptListPing(conn)
-	case 2: //for login
+	case 2: // for login
 		handlePlaying(conn, protocol)
 	}
 }
@@ -103,19 +105,19 @@ type PlayerInfo struct {
 
 // acceptLogin check player's account
 func acceptLogin(conn net.Conn) (info PlayerInfo, err error) {
-	//login start
+	// login start
 	var p pk.Packet
 	err = conn.ReadPacket(&p)
 	if err != nil {
 		return
 	}
 
-	err = p.Scan((*pk.String)(&info.Name)) //decode username as pk.String
+	err = p.Scan((*pk.String)(&info.Name)) // decode username as pk.String
 	if err != nil {
 		return
 	}
 
-	//auth
+	// auth
 	const OnlineMode = false
 	if OnlineMode {
 		log.Panic("Not Implement")
@@ -146,7 +148,7 @@ func handshake(conn net.Conn) (protocol, intention int32, err error) {
 // loginSuccess send LoginSuccess packet to client
 func loginSuccess(conn net.Conn, name string, uuid uuid.UUID) error {
 	return conn.WritePacket(pk.Marshal(0x02,
-		pk.String(uuid.String()), //uuid as string with hyphens
+		pk.String(uuid.String()), // uuid as string with hyphens
 		pk.String(name),
 	))
 }

examples/simpleServer1.15.2/status.go

@@ -20,9 +20,9 @@ func acceptListPing(conn net.Conn) {
 		}
 
 		switch p.ID {
-		case 0x00: //List
+		case 0x00: // List
 			err = conn.WritePacket(pk.Marshal(0x00, pk.String(listResp())))
-		case 0x01: //Ping
+		case 0x01: // Ping
 			err = conn.WritePacket(p)
 		}
 		if err != nil {

examples/simpleServer1.17.1/main.go

@@ -13,8 +13,10 @@ import (
 	"github.com/Tnze/go-mc/offline"
 )
 
-const ProtocolVersion = 756
-const MaxPlayer = 200
+const (
+	ProtocolVersion = 756
+	MaxPlayer       = 200
+)
 
 // Packet IDs
 const (
@@ -47,11 +49,11 @@ func acceptConn(conn net.Conn) {
 	}
 
 	switch intention {
-	default: //unknown error
+	default: // unknown error
 		log.Printf("Unknown handshake intention: %v", intention)
-	case 1: //for status
+	case 1: // for status
 		acceptListPing(conn)
-	case 2: //for login
+	case 2: // for login
 		handlePlaying(conn, protocol)
 	}
 }
@@ -106,19 +108,19 @@ type PlayerInfo struct {
 
 // acceptLogin check player's account
 func acceptLogin(conn net.Conn) (info PlayerInfo, err error) {
-	//login start
+	// login start
 	var p pk.Packet
 	err = conn.ReadPacket(&p)
 	if err != nil {
 		return
 	}
 
-	err = p.Scan((*pk.String)(&info.Name)) //decode username as pk.String
+	err = p.Scan((*pk.String)(&info.Name)) // decode username as pk.String
 	if err != nil {
 		return
 	}
 
-	//auth
+	// auth
 	const OnlineMode = false
 	if OnlineMode {
 		log.Panic("Not Implement")

examples/simpleServer1.17.1/status.go

@@ -2,11 +2,12 @@ package main
 
 import (
 	"encoding/json"
+	"log"
+
 	"github.com/Tnze/go-mc/chat"
 	"github.com/Tnze/go-mc/net"
 	pk "github.com/Tnze/go-mc/net/packet"
 	"github.com/google/uuid"
-	"log"
 )
 
 func acceptListPing(conn net.Conn) {
@@ -18,9 +19,9 @@ func acceptListPing(conn net.Conn) {
 		}
 
 		switch p.ID {
-		case 0x00: //List
+		case 0x00: // List
 			err = conn.WritePacket(pk.Marshal(0x00, pk.String(listResp())))
-		case 0x01: //Ping
+		case 0x01: // Ping
 			err = conn.WritePacket(p)
 		}
 		if err != nil {