From 62924b69a71581eba39e96761f4e85928a47fc82 Mon Sep 17 00:00:00 2001 From: olebeck <31539311+olebeck@users.noreply.github.com> Date: Wed, 24 Aug 2022 03:41:05 +0200 Subject: [PATCH] dont download resource packs when not needed --- go.mod | 2 +- go.sum | 2 ++ resourcepack-ace.go | Bin 6146 -> 6152 bytes skins.go | 2 +- utils.go | 13 +++++++------ 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 03b1b56..f60eb95 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( //replace github.com/df-mc/dragonfly => ./dragonfly -replace github.com/sandertv/gophertunnel => github.com/olebeck/gophertunnel v1.24.8-1 +replace github.com/sandertv/gophertunnel => github.com/olebeck/gophertunnel v1.24.8-2 replace github.com/df-mc/dragonfly => github.com/olebeck/dragonfly v0.8.2-5 diff --git a/go.sum b/go.sum index d4b66fb..0549fe3 100644 --- a/go.sum +++ b/go.sum @@ -45,6 +45,8 @@ github.com/olebeck/gophertunnel v1.24.7 h1:EMYLDMxGxzPtoI/Y77KHPcfelkGS+QcjdtStG github.com/olebeck/gophertunnel v1.24.7/go.mod h1:dMOw79FHxr2azEqiGH20AwdljisAN1kqwu5SjPBnZ5k= github.com/olebeck/gophertunnel v1.24.8-1 h1:ECZs6y/ZtvUjhIPlu3RjJr8c5QkOdxdQnoO+4iR4TEk= github.com/olebeck/gophertunnel v1.24.8-1/go.mod h1:dMOw79FHxr2azEqiGH20AwdljisAN1kqwu5SjPBnZ5k= +github.com/olebeck/gophertunnel v1.24.8-2 h1:T7WY2M/GrKTOgcH1RcDiB8LNlhK+PEzGdHSaYP4V518= +github.com/olebeck/gophertunnel v1.24.8-2/go.mod h1:dMOw79FHxr2azEqiGH20AwdljisAN1kqwu5SjPBnZ5k= github.com/olebeck/gophertunnel v1.24.8 h1:jdqBOABDAE1yISqzm9IxIrI+/lJApLBjTieynXUSalw= github.com/olebeck/gophertunnel v1.24.8/go.mod h1:dMOw79FHxr2azEqiGH20AwdljisAN1kqwu5SjPBnZ5k= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= diff --git a/resourcepack-ace.go b/resourcepack-ace.go index 9a1051404f01eff5df9c3b5f720faa3e660470a1..5eb2b40d21b58a8b5097f0904509c9faa19d444a 100644 GIT binary patch literal 6152 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 aI`lom83=c-@3-zw9{X}O1{91+J)+Ewe94;t literal 6146 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 UHSm34&0~Q(=PXXx7cw^soP#~zl>h($ diff --git a/skins.go b/skins.go index cc5350b..98de7f1 100644 --- a/skins.go +++ b/skins.go @@ -245,7 +245,7 @@ func (c *SkinCMD) Execute(ctx context.Context, f *flag.FlagSet, _ ...interface{} return 1 } - serverConn, err := connect_server(ctx, address, nil) + serverConn, err := connect_server(ctx, address, nil, false) if err != nil { fmt.Fprint(os.Stderr, err) return 1 diff --git a/utils.go b/utils.go index cf59271..a188bf0 100644 --- a/utils.go +++ b/utils.go @@ -107,7 +107,7 @@ func server_url_to_name(server string) string { return host } -func connect_server(ctx context.Context, address string, ClientData *login.ClientData) (serverConn *minecraft.Conn, err error) { +func connect_server(ctx context.Context, address string, ClientData *login.ClientData, want_packs bool) (serverConn *minecraft.Conn, err error) { var packet_func func(header packet.Header, payload []byte, src, dst net.Addr) = nil if G_debug { packet_func = PacketLogger @@ -120,9 +120,10 @@ func connect_server(ctx context.Context, address string, ClientData *login.Clien fmt.Printf("Connecting to %s\n", address) serverConn, err = minecraft.Dialer{ - TokenSource: GetTokenSource(), - ClientData: cd, - PacketFunc: packet_func, + TokenSource: GetTokenSource(), + ClientData: cd, + PacketFunc: packet_func, + DownloadPacks: want_packs, }.DialContext(ctx, "raknet", address) if err != nil { return nil, err @@ -165,7 +166,7 @@ func create_proxy(ctx context.Context, server_address string) (l *minecraft.List var packs []*resource.Pack if G_preload_packs { fmt.Println("Preloading resourcepacks") - serverConn, err = connect_server(ctx, server_address, nil) + serverConn, err = connect_server(ctx, server_address, nil, true) if err != nil { return nil, nil, nil, fmt.Errorf("failed to connect to %s: %s", server_address, err) } @@ -193,7 +194,7 @@ func create_proxy(ctx context.Context, server_address string) (l *minecraft.List clientConn = c.(*minecraft.Conn) cd := clientConn.ClientData() - serverConn, err = connect_server(ctx, server_address, &cd) + serverConn, err = connect_server(ctx, server_address, &cd, false) if err != nil { return nil, nil, nil, fmt.Errorf("failed to connect to %s: %s", server_address, err) }