falloutBot/go-mc
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #206

Browse Source
This commit is contained in:
Tnze
2022-06-14 13:15:57 +08:00
parent 780260c3bf
commit 44703ce940
12 changed files with 70 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bot/mcbot.go
View File

@ -9,7 +9,6 @@ import (
"encoding/base64"
"encoding/pem"
"errors"
"github.com/Tnze/go-mc/yggdrasil/userApi"
"net"
"strconv"
@ -17,6 +16,7 @@ import (
"github.com/Tnze/go-mc/data/packetid"
mcnet "github.com/Tnze/go-mc/net"
pk "github.com/Tnze/go-mc/net/packet"
"github.com/Tnze/go-mc/yggdrasil/user"
)
// ProtocolVersion is the protocol version number of minecraft net protocol
@ -75,7 +75,7 @@ func (c *Client) join(ctx context.Context, d *mcnet.Dialer, addr string) error {
return LoginErr{"handshake", err}
}
// Login Start
pair, err := userApi.GetOrFetchKeyPair(c.Auth.AsTk)
pair, err := user.GetOrFetchKeyPair(c.Auth.AsTk)
if err != nil {
// (No Signature)
err = c.Conn.WritePacket(pk.Marshal(
@ -101,7 +101,7 @@ func (c *Client) join(ctx context.Context, d *mcnet.Dialer, addr string) error {
if err != nil {
return LoginErr{"login start (with sig)", err}
}
c.KeyPair = &pair
c.KeyPair = pair
}
for {
//Receive Packet