用更简单的方式为bot包支持代理

This commit is contained in:
Tnze
2020-01-05 01:14:38 +08:00
parent 933222faf5
commit 72b1820826

View File

@ -16,19 +16,26 @@ const ProtocolVersion = 575
// JoinServer connect a Minecraft server for playing the game. // JoinServer connect a Minecraft server for playing the game.
func (c *Client) JoinServer(addr string, port int) (err error) { func (c *Client) JoinServer(addr string, port int) (err error) {
//Connect conn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", addr, port))
conn, err := mcnet.DialMC(fmt.Sprintf("%s:%d", addr, port))
if err != nil { if err != nil {
err = fmt.Errorf("bot: connect server fail: %v", err) err = fmt.Errorf("bot: connect server fail: %v", err)
return return
} }
return c.join(conn)
}
//JoinConn // JoinServerWithDialer is similar to JoinServer but using a Dialer.
return c.JoinConn(conn.Socket) func (c *Client) JoinServerWithDialer(d Dialer, addr string) (err error) {
conn, err := d.Dial("tcp", addr)
if err != nil {
err = fmt.Errorf("bot: connect server fail: %v", err)
return
}
return c.join(conn)
} }
// JoinConn join a Minecraft server through a connection for playing the game. // JoinConn join a Minecraft server through a connection for playing the game.
func (c *Client) JoinConn(conn net.Conn) (err error) { func (c *Client) join(conn net.Conn) (err error) {
//Set Conn //Set Conn
c.conn = mcnet.WrapConn(conn) c.conn = mcnet.WrapConn(conn)
@ -104,6 +111,12 @@ func (c *Client) JoinConn(conn net.Conn) (err error) {
} }
} }
// A Dialer is a means to establish a connection.
type Dialer interface {
// Dial connects to the given address via the proxy.
Dial(network, addr string) (c net.Conn, err error)
}
// Conn return the MCConn of the Client. // Conn return the MCConn of the Client.
// Only used when you want to handle the packets by yourself // Only used when you want to handle the packets by yourself
func (c *Client) Conn() *mcnet.Conn { func (c *Client) Conn() *mcnet.Conn {