diff --git a/authenticate/authenticate.go b/authenticate/authenticate.go index 693117c..2ef7687 100644 --- a/authenticate/authenticate.go +++ b/authenticate/authenticate.go @@ -10,15 +10,15 @@ import ( "net/http" ) -// Agent is a struct of auth -type Agent struct { +// agent is a struct of auth +type agent struct { Name string `json:"name"` Version int `json:"version"` } -// Payload is a authenticate request struct -type Payload struct { - Agent `json:"agent"` +// payload is a authenticate request struct +type payload struct { + Agent agent `json:"agent"` UserName string `json:"username"` Password string `json:"password"` ClientToken string `json:"clientToken"` @@ -27,14 +27,14 @@ type Payload struct { // Authenticate authenticates a user using their password. func Authenticate(user, passwd string) (respData Response, err error) { - j, err := json.Marshal(Payload{ - Agent: Agent{ + j, err := json.Marshal(payload{ + Agent: agent{ Name: "Minecraft", Version: 1, }, UserName: user, Password: passwd, - ClientToken: "gomcbotauther", + ClientToken: "go-mc", RequestUser: true, }) // fmt.Println(string(j)) @@ -51,7 +51,7 @@ func Authenticate(user, passwd string) (respData Response, err error) { err = fmt.Errorf("make request error: %v", err) return } - PostRequest.Header.Set("User-Agent", "go-mc") + PostRequest.Header.Set("User-agent", "go-mc") PostRequest.Header.Set("Connection", "keep-alive") PostRequest.Header.Set("Content-Type", "application/json") resp, err := client.Do(PostRequest) diff --git a/authenticate/authenticate_test.go b/authenticate/authenticate_test.go index a05b705..b9e79ef 100644 --- a/authenticate/authenticate_test.go +++ b/authenticate/authenticate_test.go @@ -7,8 +7,8 @@ import ( ) func TestEncodingPayload(t *testing.T) { - j, err := json.Marshal(Payload{ - Agent: Agent{ + j, err := json.Marshal(payload{ + Agent: agent{ Name: "Minecraft", Version: 1, }, diff --git a/bot/login.go b/bot/login.go index 731fb28..14fb40d 100644 --- a/bot/login.go +++ b/bot/login.go @@ -167,7 +167,7 @@ func loginAuth(AsTk, name, UUID string, shareSecret []byte, er encryptionRequest if err != nil { return fmt.Errorf("make request error: %v", err) } - PostRequest.Header.Set("User-Agent", "go-mc") + PostRequest.Header.Set("User-agent", "go-mc") PostRequest.Header.Set("Connection", "keep-alive") resp, err := client.Do(PostRequest) if err != nil { diff --git a/save/mca.go b/save/mca.go new file mode 100644 index 0000000..fa7ce13 --- /dev/null +++ b/save/mca.go @@ -0,0 +1,4 @@ +package save + +type Region struct { +}