From d0ecf1c261a6a38fc69b1227779348ace9124906 Mon Sep 17 00:00:00 2001 From: olebeck <31539311+olebeck@users.noreply.github.com> Date: Sat, 24 Dec 2022 10:56:46 +0100 Subject: [PATCH] be more clear about proxy usage, allow flags in interactive --- cmd/bedrocktool/main.go | 6 ++++-- utils/proxy.go | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmd/bedrocktool/main.go b/cmd/bedrocktool/main.go index 1a363bd..060a51f 100644 --- a/cmd/bedrocktool/main.go +++ b/cmd/bedrocktool/main.go @@ -8,6 +8,7 @@ import ( "os" "os/signal" "runtime/debug" + "strings" "syscall" "github.com/bedrock-tool/bedrocktool/utils" @@ -54,7 +55,7 @@ func main() { logrus.Error(err) } - if newVersion != "" { + if newVersion != "" && utils.Version != "" { logrus.Infof("Update Available: %s", newVersion) } @@ -86,7 +87,8 @@ func main() { if cancelled { return } - os.Args = append(os.Args, cmd) + _cmd := strings.Split(cmd, " ") + os.Args = append(os.Args, _cmd...) utils.G_interactive = true } } diff --git a/utils/proxy.go b/utils/proxy.go index 3fccc29..4d8f44a 100644 --- a/utils/proxy.go +++ b/utils/proxy.go @@ -192,6 +192,7 @@ func (p *ProxyContext) Run(ctx context.Context, server_address string) (err erro defer p.Listener.Close() p.log.Infof("Listening on %s", p.Listener.Addr()) + p.log.Infof("Open Minecraft and connect to this computers local ip address to continue") var c net.Conn c, err = p.Listener.Accept()