format repo with "gofumpt" tool

This commit is contained in:
Tnze
2022-11-26 20:37:57 +08:00
parent 7814e7b1ab
commit fad92fe364
61 changed files with 333 additions and 268 deletions

View File

@ -1,4 +1,5 @@
//+build generate
//go:build generate
// +build generate
// This program can automatically download language.json file and convert into .go
package main
@ -17,9 +18,8 @@ import (
"text/template"
)
var (
//language=gohtml
langTmpl = `// Code generated by downloader.go; DO NOT EDIT.
// language=gohtml
var langTmpl = `// Code generated by downloader.go; DO NOT EDIT.
package {{.Name}}
{{if ne .Name "en_us"}}
import "github.com/Tnze/go-mc/chat"
@ -28,7 +28,6 @@ func init() { chat.SetLanguage(Map) }
{{end}}
var Map = {{.LangMap | printf "%#v"}}
`
)
//go:generate go run $GOFILE
//go:generate go fmt ./...
@ -90,7 +89,7 @@ func main() {
}
func lang(name, hash string) {
//download language
// download language
LangURL := "http://resources.download.minecraft.net/" + hash[:2] + "/" + hash
resp, err := http.Get(LangURL)
if err != nil {
@ -112,12 +111,12 @@ func readLang(name string, r io.Reader) {
pName := strings.ReplaceAll(name, "_", "-")
// mkdir
err = os.Mkdir(pName, 0777)
err = os.Mkdir(pName, 0o777)
if err != nil && !os.IsExist(err) {
panic(err)
}
f, err := os.OpenFile(filepath.Join(pName, name+".go"), os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0666)
f, err := os.OpenFile(filepath.Join(pName, name+".go"), os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0o666)
if err != nil {
panic(err)
}
@ -143,7 +142,7 @@ var javaN = regexp.MustCompile(`%[0-9]\$s`)
// Java use %2$s to refer to the second arg, but Golang use %2s, so we need this
func trans(m map[string]string) {
//replace "%[0-9]\$s" with "%[0-9]s"
// replace "%[0-9]\$s" with "%[0-9]s"
for i := range m {
c := m[i]
if javaN.MatchString(c) {
@ -169,8 +168,8 @@ func assetIndexURL() (string, error) {
Latest struct {
Release string `json:"release"`
} `json:"latest"`
Versions []struct{
ID string `json:"id"`
Versions []struct {
ID string `json:"id"`
URL string `json:"url"`
} `json:"versions"`
}
@ -196,8 +195,8 @@ func assetIndexURL() (string, error) {
return "", errors.New("could not determine versionURL")
}
var version struct{
AssetIndex struct{
var version struct {
AssetIndex struct {
URL string `json:"url"`
} `json:"assetIndex"`
}