diff --git a/cmd/bedrocktool/main.go b/cmd/bedrocktool/main.go index a9e4612..698f3ce 100644 --- a/cmd/bedrocktool/main.go +++ b/cmd/bedrocktool/main.go @@ -36,7 +36,6 @@ func (c *CLI) Init() bool { func (c *CLI) Start(ctx context.Context, cancel context.CancelFunc) error { flag.Parse() utils.InitDNS() - utils.InitExtraDebug(ctx) subcommands.Execute(ctx) time.Sleep(50 * time.Millisecond) cancel() diff --git a/go.mod b/go.mod index 40aec41..e57ded2 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ go 1.20 replace github.com/sandertv/gophertunnel => github.com/olebeck/gophertunnel v1.28.1-1 //replace github.com/df-mc/dragonfly => ./dragonfly -replace github.com/df-mc/dragonfly => github.com/olebeck/dragonfly v0.9.4-5 +replace github.com/df-mc/dragonfly => github.com/olebeck/dragonfly v0.9.4-6 //replace gioui.org => ./gio replace gioui.org => github.com/olebeck/gio v0.0.0-20230321105529-d424f1a59af9 @@ -25,6 +25,7 @@ require ( github.com/jinzhu/copier v0.3.5 github.com/miekg/dns v1.1.52 github.com/nicksnyder/go-i18n/v2 v2.2.1 + github.com/repeale/fp-go v0.11.1 github.com/sanbornm/go-selfupdate v0.0.0-20210106163404-c9b625feac49 github.com/sandertv/go-raknet v1.12.0 github.com/sandertv/gophertunnel v1.28.1 @@ -45,6 +46,7 @@ require ( git.wow.st/gmp/jni v0.0.0-20210610011705-34026c7e22d0 // indirect github.com/benoitkugler/textlayout v0.3.0 // indirect github.com/brentp/intintmap v0.0.0-20190211203843-30dc0ade9af9 // indirect + github.com/cespare/xxhash v1.1.0 // indirect github.com/changkun/lockfree v0.0.1 // indirect github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 // indirect github.com/df-mc/atomic v1.10.0 // indirect @@ -61,7 +63,7 @@ require ( github.com/mattn/go-isatty v0.0.17 // indirect github.com/muhammadmuzzammil1998/jsonc v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect - github.com/repeale/fp-go v0.11.1 // indirect + github.com/rogpeppe/go-internal v1.9.0 // indirect github.com/tklauser/go-sysconf v0.3.11 // indirect github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect diff --git a/go.sum b/go.sum index a97eee9..68fa9a6 100644 --- a/go.sum +++ b/go.sum @@ -90,6 +90,8 @@ github.com/nicksnyder/go-i18n/v2 v2.2.1 h1:aOzRCdwsJuoExfZhoiXHy4bjruwCMdt5otbYo github.com/nicksnyder/go-i18n/v2 v2.2.1/go.mod h1:fF2++lPHlo+/kPaj3nB0uxtPwzlPm+BlgwGX7MkeGj0= github.com/olebeck/dragonfly v0.9.4-5 h1:ixVX0Fe3wX8FryJiKC5gFVS4KDrKtd1dXJoBkzWhd1c= github.com/olebeck/dragonfly v0.9.4-5/go.mod h1:k8OQvjmfj+JbrwQf1qHfMETlFHOp0WJLjILN+QVqh+c= +github.com/olebeck/dragonfly v0.9.4-6 h1:Pom7oMbUA/kFu6PCwr3mWtTOSPvgzD2/71+mUsqK42o= +github.com/olebeck/dragonfly v0.9.4-6/go.mod h1:k8OQvjmfj+JbrwQf1qHfMETlFHOp0WJLjILN+QVqh+c= github.com/olebeck/gio v0.0.0-20230321105529-d424f1a59af9 h1:TqDsMHwjW5ZYfh+RE8ussT62m0qXqo+QjzSXb7BCVA4= github.com/olebeck/gio v0.0.0-20230321105529-d424f1a59af9/go.mod h1:+W1Kpf96YcfissZocFqIp6O42FDTuphkObbEybp+Ffc= github.com/olebeck/gophertunnel v1.28.1-1 h1:bw2jeMz94YHF5qQYhq1Yq/6fALkklGu7k26YbPI4DSs= diff --git a/subcommands/capture.go b/subcommands/capture.go index 09b2220..f4f3b1b 100644 --- a/subcommands/capture.go +++ b/subcommands/capture.go @@ -4,9 +4,9 @@ import ( "context" "flag" + "github.com/bedrock-tool/bedrocktool/handlers" "github.com/bedrock-tool/bedrocktool/locale" "github.com/bedrock-tool/bedrocktool/utils" - "github.com/bedrock-tool/bedrocktool/utils/handlers" ) func init() { diff --git a/subcommands/chat_log.go b/subcommands/chat_log.go index c48ea93..078eaf6 100644 --- a/subcommands/chat_log.go +++ b/subcommands/chat_log.go @@ -4,9 +4,9 @@ import ( "context" "flag" + "github.com/bedrock-tool/bedrocktool/handlers" "github.com/bedrock-tool/bedrocktool/locale" "github.com/bedrock-tool/bedrocktool/utils" - "github.com/bedrock-tool/bedrocktool/utils/handlers" ) type ChatLogCMD struct { diff --git a/subcommands/debug.go b/subcommands/debug.go index ffdf7a5..b658c9f 100644 --- a/subcommands/debug.go +++ b/subcommands/debug.go @@ -4,9 +4,9 @@ import ( "context" "flag" + seconduser "github.com/bedrock-tool/bedrocktool/handlers/second-user" "github.com/bedrock-tool/bedrocktool/locale" "github.com/bedrock-tool/bedrocktool/utils" - seconduser "github.com/bedrock-tool/bedrocktool/utils/handlers/second-user" ) type DebugProxyCMD struct { diff --git a/subcommands/skins/skins.go b/subcommands/skins/skins.go index af56545..adedde1 100644 --- a/subcommands/skins/skins.go +++ b/subcommands/skins/skins.go @@ -4,17 +4,14 @@ import ( "context" "flag" + "github.com/bedrock-tool/bedrocktool/handlers" "github.com/bedrock-tool/bedrocktool/locale" "github.com/bedrock-tool/bedrocktool/ui/messages" "github.com/bedrock-tool/bedrocktool/utils" - "github.com/bedrock-tool/bedrocktool/utils/handlers" "github.com/sandertv/gophertunnel/minecraft" ) -type skinsSession struct { -} - type SkinCMD struct { ServerAddress string Filter string