From a6488c98c931ef9c2aad4abff483e196239d13b2 Mon Sep 17 00:00:00 2001 From: olebeck <31539311+olebeck@users.noreply.github.com> Date: Tue, 14 Mar 2023 02:07:39 +0100 Subject: [PATCH] gui rewrite, enable entities --- build.py | 114 ++-- go.mod | 43 +- go.sum | 681 +------------------ subcommands/resourcepack-d/resourcepack-d.go | Bin 5403 -> 5423 bytes subcommands/world/entity.go | 5 + subcommands/world/map_item.go | 35 +- subcommands/world/world.go | 31 +- ui/gui.go | 230 ++----- ui/gui/common.go | 1 + ui/gui/console_widget.go | 36 - ui/gui/map_widget.go | 60 -- ui/gui/pages/page.go | 145 ++++ ui/gui/pages/settings/settings.go | 180 +++++ ui/gui/pages/worlds/map.go | 78 +++ ui/gui/pages/worlds/worlds.go | 125 ++++ ui/gui/settings/register.go | 14 + ui/gui/settings/worlds.go | 43 ++ ui/gui/uis.go | 12 +- ui/gui/worlds.go | 122 ---- utils/behaviourpack/bp.go | 11 +- utils/behaviourpack/entity.go | 22 +- utils/command_register.go | 2 +- utils/iui.go | 6 +- utils/messages.go | 33 +- utils/packet_logger.go | 29 +- utils/proxy.go | 2 +- utils/utils.go | 9 +- 27 files changed, 856 insertions(+), 1213 deletions(-) create mode 100644 ui/gui/common.go delete mode 100644 ui/gui/console_widget.go delete mode 100644 ui/gui/map_widget.go create mode 100644 ui/gui/pages/page.go create mode 100644 ui/gui/pages/settings/settings.go create mode 100644 ui/gui/pages/worlds/map.go create mode 100644 ui/gui/pages/worlds/worlds.go create mode 100644 ui/gui/settings/register.go create mode 100644 ui/gui/settings/worlds.go delete mode 100644 ui/gui/worlds.go diff --git a/build.py b/build.py index c377315..c0e340b 100644 --- a/build.py +++ b/build.py @@ -32,7 +32,7 @@ PLATFORMS = [ ("windows", ["amd64"], ".exe"), ("linux", ["amd64"], ""), #("darwin", ["amd64", "arm64"], ""), - ("android", ["arm64"], ".apk") + #("android", ["arm64"], ".apk") ] platform_filter = "" @@ -72,84 +72,54 @@ for (platform_name, archs, ext) in PLATFORMS: tags = [] if PACK_SUPPORT: tags.append("packs") + if GUI: + tags.append("gui") env = { "GOVCS": "*:off" } - if GUI: - args = [ - "fyne-cross", platform_name, - "-app-version", VER, - "-arch", ",".join(archs), - "-ldflags", LDFLAGS + f" -X github.com/bedrock-tool/bedrocktool/utils.CmdName=bedrocktool-gui", - "-name", name, - "-tags", ",".join(["gui"] + tags), - "-debug" - ] - for k,v in env.items(): - args.extend(["-env", f"{k}={v}"]) - if platform_name == "windows": - args.append("-console") - if platform_name in ["android"]: - args.extend(["-app-id", APP_ID]) - args.append("./cmd/bedrocktool") - out = subprocess.run(args) - out.check_returncode() - else: - for arch in archs: - out_path = f"./tmp/{platform_name}-{arch}/{name}{ext}" - os.makedirs(os.path.dirname(out_path), exist_ok=True) - env.update({ - "GOOS": platform_name, - "GOARCH": arch, - "CGO_ENABLED": "0" - }) - args = [ - "go", "build", - "-ldflags", LDFLAGS, - "-trimpath", - "-tags", ",".join(tags), - "-v", - "-o", out_path, - ] - args.append("./cmd/bedrocktool") - print(args) - - env2 = os.environ.copy() - env2.update(env) - - out = subprocess.run(args, env=env2) - out.check_returncode() - for arch in archs: + compiled_path = f"./tmp/{platform_name}-{arch}{SUB1}/{name}{ext}" + os.makedirs(os.path.dirname(compiled_path), exist_ok=True) + env.update({ + "GOOS": platform_name, + "GOARCH": arch, + }) + args = [ + "go", "build", + "-ldflags", LDFLAGS, + "-trimpath", + "-tags", ",".join(tags), + "-v", + "-o", compiled_path, + ] + args.append("./cmd/bedrocktool") + print(args) + + env2 = os.environ.copy() + env2.update(env) + + out = subprocess.run(args, env=env2) + out.check_returncode() + exe_out_path = f"./builds/{NAME}-{platform_name}-{arch}-{TAG}{SUB1}{ext}" - if platform_name == "android": - apk_path = f"./fyne-cross/dist/android-{arch}/{name}{ext}" - #shutil.copy(apk_path, exe_out_path) # dont upload builds yet, its not usable lol - else: - if GUI: - exe_path = f"./fyne-cross/bin/{platform_name}-{arch}/{name}" - else: - exe_path = f"./tmp/{platform_name}-{arch}/{name}{ext}" + with open(compiled_path, "rb") as f: + exe_data = f.read() + sha = binascii.b2a_base64(hashlib.sha256(exe_data).digest()).decode("utf8").split("\n")[0] + shutil.copy(compiled_path, exe_out_path) - with open(exe_path, "rb") as f: - exe_data = f.read() - sha = binascii.b2a_base64(hashlib.sha256(exe_data).digest()).decode("utf8").split("\n")[0] - shutil.copy(exe_path, exe_out_path) + updates_dir = f"./updates/{NAME}{SUB1}" + os.makedirs(updates_dir, exist_ok=True) + with open(f"{updates_dir}/{platform_name}-{arch}.json", "w") as f: + f.write(json.dumps({ + "Version": TAG, + "Sha256": sha, + }, indent=2)) + + os.makedirs(f"{updates_dir}/{TAG}", exist_ok=True) + with gzip.open(f"{updates_dir}/{TAG}/{platform_name}-{arch}.gz", "wb") as f: + f.write(exe_data) - updates_dir = f"./updates/{NAME}{SUB1}" - os.makedirs(updates_dir, exist_ok=True) - with open(f"{updates_dir}/{platform_name}-{arch}.json", "w") as f: - f.write(json.dumps({ - "Version": TAG, - "Sha256": sha, - }, indent=2)) - - os.makedirs(f"{updates_dir}/{TAG}", exist_ok=True) - with gzip.open(f"{updates_dir}/{TAG}/{platform_name}-{arch}.gz", "wb") as f: - f.write(exe_data) - - if not GUI: - os.remove(exe_path) + os.remove(compiled_path) diff --git a/go.mod b/go.mod index 5e550e8..0c687ea 100644 --- a/go.mod +++ b/go.mod @@ -6,10 +6,11 @@ go 1.20 replace github.com/sandertv/gophertunnel => github.com/olebeck/gophertunnel v1.27.4-1 //replace github.com/df-mc/dragonfly => ./dragonfly -replace github.com/df-mc/dragonfly => github.com/olebeck/dragonfly v0.9.3-1 +replace github.com/df-mc/dragonfly => github.com/olebeck/dragonfly v0.9.3-2 require ( - fyne.io/fyne/v2 v2.3.1 + gioui.org v0.0.0-20221219171716-c455f0f342ef + gioui.org/x v0.0.0-20230313161557-05b40af72ed0 github.com/cloudfoundry-attic/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 github.com/df-mc/dragonfly v0.9.3 github.com/df-mc/goleveldb v1.1.9 @@ -22,6 +23,7 @@ require ( github.com/miekg/dns v1.1.51 github.com/nicksnyder/go-i18n/v2 v2.2.1 github.com/sanbornm/go-selfupdate v0.0.0-20210106163404-c9b625feac49 + github.com/sandertv/go-raknet v1.12.0 github.com/sandertv/gophertunnel v1.27.4 github.com/sirupsen/logrus v1.9.0 golang.design/x/lockfree v0.0.1 @@ -35,50 +37,29 @@ require ( ) require ( - fyne.io/systray v1.10.1-0.20230207085535-4a244dbb9d03 // indirect - github.com/ActiveState/termtest/conpty v0.5.0 // indirect - github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect + gioui.org/cpu v0.0.0-20210817075930-8d6a761490d2 // indirect + gioui.org/shader v1.0.6 // indirect github.com/benoitkugler/textlayout v0.3.0 // indirect github.com/brentp/intintmap v0.0.0-20190211203843-30dc0ade9af9 // indirect - github.com/creack/pty v1.1.11 // indirect - github.com/davecgh/go-spew v1.1.1 // 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 - github.com/fredbi/uri v1.0.0 // indirect - github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/fyne-io/gl-js v0.0.0-20220802150000-8e339395f381 // indirect - github.com/fyne-io/glfw-js v0.0.0-20220517201726-bebc2019cd33 // indirect - github.com/fyne-io/image v0.0.0-20221020213044-f609c6a24345 // indirect - github.com/fyne-io/terminal v0.0.0-20230223114940-c76e408adbd3 // indirect - github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 // indirect - github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b // indirect - github.com/go-text/typesetting v0.0.0-20230212093906-959574cbf271 // indirect - github.com/godbus/dbus/v5 v5.1.0 // indirect - github.com/goki/freetype v0.0.0-20220119013949-7a161fd3728c // indirect + github.com/go-text/typesetting v0.0.0-20221214153724-0399769901d5 // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.4 // indirect - github.com/gopherjs/gopherjs v1.17.2 // indirect - github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e // indirect github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect - github.com/klauspost/compress v1.16.0 // indirect + github.com/klauspost/compress v1.15.15 // indirect github.com/kr/binarydist v0.1.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.17 // indirect github.com/muhammadmuzzammil1998/jsonc v1.0.0 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/sandertv/go-raknet v1.12.0 // indirect - github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c // indirect - github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect - github.com/stretchr/testify v1.8.2 // indirect - github.com/tevino/abool v1.2.0 // indirect - github.com/yuin/goldmark v1.5.4 // indirect go.uber.org/atomic v1.10.0 // indirect - golang.org/x/mobile v0.0.0-20230301163155-e0f57694e12c // indirect - golang.org/x/mod v0.9.0 // indirect + golang.org/x/exp/shiny v0.0.0-20220827204233-334a2380cb91 // indirect + golang.org/x/mod v0.8.0 // indirect golang.org/x/net v0.8.0 // indirect golang.org/x/sys v0.6.0 // indirect golang.org/x/tools v0.6.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.28.1 // indirect gopkg.in/inconshreveable/go-update.v0 v0.0.0-20150814200126-d8b0b1d421aa // indirect - honnef.co/go/js/dom v0.0.0-20221001195520-26252dedbe70 // indirect ) diff --git a/go.sum b/go.sum index 99566cb..24a0c8c 100644 --- a/go.sum +++ b/go.sum @@ -1,85 +1,28 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= -cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= -cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= -cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= -cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= -cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= -cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= -cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= -cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= -cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= -cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= -cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -fyne.io/fyne/v2 v2.3.0/go.mod h1:odfJmbFnODiKn1MXdL44JR6CK+0v8lrmgdPlrUF6w0M= -fyne.io/fyne/v2 v2.3.1 h1:2/dHeRXEpn/D4MyTHdK43g3/pxeLOi3FcdNJI+iphlM= -fyne.io/fyne/v2 v2.3.1/go.mod h1:dl/M+f0r5lJRhy+gdPbmYy97tbu3SWF/RF6/9KXMs+s= -fyne.io/systray v1.10.1-0.20221115204952-d16a6177e6f1/go.mod h1:oM2AQqGJ1AMo4nNqZFYU8xYygSBZkW2hmdJ7n4yjedE= -fyne.io/systray v1.10.1-0.20230207085535-4a244dbb9d03 h1:zb84y6X6lIi4Aeo8ehu6Qtu2fipBZ6Wzp41Ki/F4qdg= -fyne.io/systray v1.10.1-0.20230207085535-4a244dbb9d03/go.mod h1:oM2AQqGJ1AMo4nNqZFYU8xYygSBZkW2hmdJ7n4yjedE= -github.com/ActiveState/termtest/conpty v0.5.0 h1:JLUe6YDs4Jw4xNPCU+8VwTpniYOGeKzQg4SM2YHQNA8= -github.com/ActiveState/termtest/conpty v0.5.0/go.mod h1:LO4208FLsxw6DcNZ1UtuGUMW+ga9PFtX4ntv8Ymg9og= -github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8= -github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +eliasnaur.com/font v0.0.0-20220124212145-832bb8fc08c3 h1:djFprmHZgrSepsHAIRMp5UJn3PzsoTg9drI+BDmif5Q= +gioui.org v0.0.0-20221219171716-c455f0f342ef h1:0nxeswOamzSRIjFjRmASp+sWCAFzVt7UCC3HlRHIB6k= +gioui.org v0.0.0-20221219171716-c455f0f342ef/go.mod h1:3lLo7xMHYnnHTrgKNNctBjEKKH3wQCO2Sn7ti5Jy8mU= +gioui.org/cpu v0.0.0-20210808092351-bfe733dd3334/go.mod h1:A8M0Cn5o+vY5LTMlnRoK3O5kG+rH0kWfJjeKd9QpBmQ= +gioui.org/cpu v0.0.0-20210817075930-8d6a761490d2 h1:AGDDxsJE1RpcXTAxPG2B4jrwVUJGFDjINIPi1jtO6pc= +gioui.org/cpu v0.0.0-20210817075930-8d6a761490d2/go.mod h1:A8M0Cn5o+vY5LTMlnRoK3O5kG+rH0kWfJjeKd9QpBmQ= +gioui.org/shader v1.0.6 h1:cvZmU+eODFR2545X+/8XucgZdTtEjR3QWW6W65b0q5Y= +gioui.org/shader v1.0.6/go.mod h1:mWdiME581d/kV7/iEhLmUgUK5iZ09XR5XpduXzbePVM= +gioui.org/x v0.0.0-20230313161557-05b40af72ed0 h1:jjdcmnjM8R1yhiBBbPinm5TLNs6uRei25fjnvgYBTjU= +gioui.org/x v0.0.0-20230313161557-05b40af72ed0/go.mod h1:kmHRtak7XgGZYYuqFgDBJ42PbQjPrV/xOpw9FLx3eVY= +github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU= github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/akavel/rsrc v0.10.2/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c= -github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/benoitkugler/pstokenizer v1.0.0/go.mod h1:l1G2Voirz0q/jj0TQfabNxVsa8HZXh/VMxFSRALWTiE= github.com/benoitkugler/textlayout v0.3.0 h1:2ehWXEkgb6RUokTjXh1LzdGwG4dRP6X3dqhYYDYhUVk= github.com/benoitkugler/textlayout v0.3.0/go.mod h1:o+1hFV+JSHBC9qNLIuwVoLedERU7sBPgEFcuSgfvi/w= +github.com/benoitkugler/textlayout-testdata v0.1.1 h1:AvFxBxpfrQd8v55qH59mZOJOQjtD6K2SFe9/HvnIbJk= github.com/benoitkugler/textlayout-testdata v0.1.1/go.mod h1:i/qZl09BbUOtd7Bu/W1CAubRwTWrEXWq6JwMkw8wYxo= -github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/brentp/intintmap v0.0.0-20190211203843-30dc0ade9af9 h1:/G0ghZwrhou0Wq21qc1vXXMm/t/aKWkALWwITptKbE0= github.com/brentp/intintmap v0.0.0-20190211203843-30dc0ade9af9/go.mod h1:TOk10ahXejq9wkEaym3KPRNeuR/h5Jx+s8QRWIa2oTM= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/changkun/lockfree v0.0.1 h1:5WefVJLglY4IHRqOQmh6Ao6wkJYaJkarshKU8VUtId4= +github.com/changkun/lockfree v0.0.1/go.mod h1:3bKiaXn/iNzIPlSvSOMSVbRQUQtAp8qUAyBUtzU11s4= github.com/cloudfoundry-attic/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 h1:Yg2hDs4b13Evkpj42FU2idX2cVXVFqQSheXYKM86Qsk= github.com/cloudfoundry-attic/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21/go.mod h1:MgJyK38wkzZbiZSKeIeFankxxSA8gayko/nr5x5bgBA= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= -github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 h1:tuijfIjZyjZaHq9xDUh0tNitwXshJpbLkqMOJv4H3do= +github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21/go.mod h1:po7NpZ/QiTKzBKyrsEAxwnTamCoh8uDk/egRpQ7siIc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -87,495 +30,119 @@ github.com/df-mc/atomic v1.10.0 h1:0ZuxBKwR/hxcFGorKiHIp+hY7hgY+XBTzhCYD2NqSEg= github.com/df-mc/atomic v1.10.0/go.mod h1:Gw9rf+rPIbydMjA329Jn4yjd/O2c/qusw3iNp4tFGSc= github.com/df-mc/goleveldb v1.1.9 h1:ihdosZyy5jkQKrxucTQmN90jq/2lUwQnJZjIYIC/9YU= github.com/df-mc/goleveldb v1.1.9/go.mod h1:+NHCup03Sci5q84APIA21z3iPZCuk6m6ABtg4nANCSk= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= -github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w= github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg= github.com/flytam/filenamify v1.1.2 h1:dGlfWU4zrhDlsmvob4IFcfgjG5vIjfo4UwLyec6Wx94= github.com/flytam/filenamify v1.1.2/go.mod h1:Dzf9kVycwcsBlr2ATg6uxjqiFgKGH+5SKFuhdeP5zu8= -github.com/fredbi/uri v0.1.0/go.mod h1:1xC40RnIOGCaQzswaOvrzvG/3M3F0hyDVb3aO/1iGy0= -github.com/fredbi/uri v1.0.0 h1:s4QwUAZ8fz+mbTsukND+4V5f+mJ/wjaTokwstGUAemg= -github.com/fredbi/uri v1.0.0/go.mod h1:1xC40RnIOGCaQzswaOvrzvG/3M3F0hyDVb3aO/1iGy0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= -github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= -github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= -github.com/fyne-io/gl-js v0.0.0-20220119005834-d2da28d9ccfe/go.mod h1:d4clgH0/GrRwWjRzJJQXxT/h1TyuNSfF/X64zb/3Ggg= -github.com/fyne-io/gl-js v0.0.0-20220802150000-8e339395f381 h1:SFtj9yo9C7F4CxyJeSJi9AjT6x9c88gnY1tjlXWh9QU= -github.com/fyne-io/gl-js v0.0.0-20220802150000-8e339395f381/go.mod h1:d4clgH0/GrRwWjRzJJQXxT/h1TyuNSfF/X64zb/3Ggg= -github.com/fyne-io/glfw-js v0.0.0-20220120001248-ee7290d23504/go.mod h1:gLRWYfYnMA9TONeppRSikMdXlHQ97xVsPojddUv3b/E= -github.com/fyne-io/glfw-js v0.0.0-20220517201726-bebc2019cd33 h1:0Ayg0/do/sqX2R7NonoLZvWxGrd9utTVf3A0QvCbC88= -github.com/fyne-io/glfw-js v0.0.0-20220517201726-bebc2019cd33/go.mod h1:gLRWYfYnMA9TONeppRSikMdXlHQ97xVsPojddUv3b/E= -github.com/fyne-io/image v0.0.0-20220602074514-4956b0afb3d2/go.mod h1:eO7W361vmlPOrykIg+Rsh1SZ3tQBaOsfzZhsIOb/Lm0= -github.com/fyne-io/image v0.0.0-20221020213044-f609c6a24345 h1:ONkcbJmsWUOHyjUm0wlnkFc/uaacFFtStVbsG6qJfew= -github.com/fyne-io/image v0.0.0-20221020213044-f609c6a24345/go.mod h1:eO7W361vmlPOrykIg+Rsh1SZ3tQBaOsfzZhsIOb/Lm0= -github.com/fyne-io/terminal v0.0.0-20230223114940-c76e408adbd3 h1:yVnI7pzJFW7SgiSE1FYXl+2Dk2SutKskSCsY+fEepqo= -github.com/fyne-io/terminal v0.0.0-20230223114940-c76e408adbd3/go.mod h1:Ig1MvNwtLt+cjPtp+7srygEjH7diSCxyt3A3AfpVgxw= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 h1:zDw5v7qm4yH7N8C8uWd+8Ii9rROdgWxQuGoJ9WDXxfk= -github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw= -github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20211213063430-748e38ca8aec/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b h1:GgabKamyOYguHqHjSkDACcgoPIz3w0Dis/zJ1wyHHHU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/mathgl v1.0.0 h1:t9DznWJlXxxjeeKLIdovCOVJQk/GzDEL7h/h+Ro2B68= github.com/go-gl/mathgl v1.0.0/go.mod h1:yhpkQzEiH9yPyxDUGzkmgScbaBVlhC06qodikEM0ZwQ= -github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= -github.com/go-text/typesetting v0.0.0-20221212183139-1eb938670a1f/go.mod h1:/cmOXaoTiO+lbCwkTZBgCvevJpbFsZ5reXIpEJVh5MI= -github.com/go-text/typesetting v0.0.0-20230212093906-959574cbf271 h1:B6f6ifrI1CZvYE55awJQ2PFvLqbzhRXyRMYzbvgDMGo= -github.com/go-text/typesetting v0.0.0-20230212093906-959574cbf271/go.mod h1:pryFoxPu+RU9GDoqsk3qyLPZ/iDpwD0uSpgl2jaLABo= -github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= -github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/goki/freetype v0.0.0-20220119013949-7a161fd3728c h1:JGCm/+tJ9gC6THUxooTldS+CUDsba0qvkvU3DHklqW8= -github.com/goki/freetype v0.0.0-20220119013949-7a161fd3728c/go.mod h1:wfqRWLHRBsRgkp5dmbG56SA0DmVtwrF5N3oPdI8t+Aw= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= +github.com/go-text/typesetting v0.0.0-20221214153724-0399769901d5 h1:iOA0HmtpANn48hX2nlDNMu0VVaNza35HJG0WeetBVzQ= +github.com/go-text/typesetting v0.0.0-20221214153724-0399769901d5/go.mod h1:/cmOXaoTiO+lbCwkTZBgCvevJpbFsZ5reXIpEJVh5MI= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN9oE= github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= -github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gopherjs/gopherjs v0.0.0-20211219123610-ec9572f70e60/go.mod h1:cz9oNYuRUWGdHmLF2IodMLkAhcPtXeULvcBNagUrxTI= -github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g= -github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k= -github.com/goxjs/gl v0.0.0-20210104184919-e3fafc6f8f2a/go.mod h1:dy/f2gjY09hwVfIyATps4G2ai7/hLwLkc5TrPqONuXY= -github.com/goxjs/glfw v0.0.0-20191126052801-d2efb5f20838/go.mod h1:oS8P8gVOT4ywTcjV6wZlOU4GuVFQ8F5328KY3MJ79CY= -github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= -github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= -github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/jackmordaunt/icns/v2 v2.2.1/go.mod h1:6aYIB9eSzyfHHMKqDf17Xrs1zetQPReAkiUSHzdw4cI= github.com/jinzhu/copier v0.3.5 h1:GlvfUwHk62RokgqVNvYsku0TATCF7bAHVwEXoBh3iJg= github.com/jinzhu/copier v0.3.5/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg= -github.com/josephspurrier/goversioninfo v1.4.0/go.mod h1:JWzv5rKQr+MmW+LvM412ToT/IkYDZjaclF2pKDss8IY= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e h1:LvL4XsI70QxOGHed6yhQtAU34Kx3Qq2wwBzGFKY8zKk= -github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw= -github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA= github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.16.0 h1:iULayQNOReoYUe+1qtKOqw9CwJv3aNQu8ivo7lw1HU4= -github.com/klauspost/compress v1.16.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.15.15 h1:EF27CXIuDsYJ6mmvtBRlEuB2UVOqHG1tAXgZ7yIO+lw= +github.com/klauspost/compress v1.15.15/go.mod h1:ZcK2JAFqKOpnBlxcLsJzYfrS9X1akm9fHZNnD9+Vo/4= github.com/kr/binarydist v0.1.0 h1:6kAoLA9FMMnNGSehX0s1PdjbEaACznAv/W219j2uvyo= github.com/kr/binarydist v0.1.0/go.mod h1:DY7S//GCoz1BCd0B0EVrinCKAZN3pXe+MDaIZbXQVgM= -github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/lucor/goinfo v0.0.0-20210802170112-c078a2b0f08b/go.mod h1:PRq09yoB+Q2OJReAmwzKivcYyremnibWGbK7WfftHzc= -github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mcuadros/go-version v0.0.0-20190830083331-035f6764e8d2/go.mod h1:76rfSfYPWj01Z85hUf/ituArm797mNKcvINh1OlsZKo= -github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/dns v1.1.51 h1:0+Xg7vObnhrz/4ZCZcZh7zPXlmU0aveS2HDBd0m0qSo= github.com/miekg/dns v1.1.51/go.mod h1:2Z9d3CP1LQWihRZUf29mQ19yDThaI4DAYzte2CaQW5c= -github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= -github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/muhammadmuzzammil1998/jsonc v1.0.0 h1:8o5gBQn4ZA3NBA9DlTujCj2a4w0tqWrPVjDwhzkgTIs= github.com/muhammadmuzzammil1998/jsonc v1.0.0/go.mod h1:saF2fIVw4banK0H4+/EuqfFLpRnoy5S+ECwTOCcRcSU= -github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= -github.com/neelance/sourcemap v0.0.0-20200213170602-2833bce08e4c/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= -github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= -github.com/nicksnyder/go-i18n/v2 v2.1.2/go.mod h1:d++QJC9ZVf7pa48qrsRWhMJ5pSHIPmS3OLqK1niyLxs= github.com/nicksnyder/go-i18n/v2 v2.2.1 h1:aOzRCdwsJuoExfZhoiXHy4bjruwCMdt5otbYojM/PaA= github.com/nicksnyder/go-i18n/v2 v2.2.1/go.mod h1:fF2++lPHlo+/kPaj3nB0uxtPwzlPm+BlgwGX7MkeGj0= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/olebeck/dragonfly v0.9.3-1 h1:mEj5mrRP2uhkK03wGmoR0E1iBsLGuoePq5x7asuF+Zg= -github.com/olebeck/dragonfly v0.9.3-1/go.mod h1:ODAzVcmM7KvKgPB89hoYndQiVVgTm9FlDXUko1H3YVs= +github.com/olebeck/dragonfly v0.9.3-2 h1:FBO5raxeQvA286L+mUhnAsUSWxVfKmVFoofw0KdJlXA= +github.com/olebeck/dragonfly v0.9.3-2/go.mod h1:ODAzVcmM7KvKgPB89hoYndQiVVgTm9FlDXUko1H3YVs= github.com/olebeck/gophertunnel v1.27.4-1 h1:rtB5wksJBKk3sy9lBFZ1aH2giCathINj4zQkl1rPTMg= github.com/olebeck/gophertunnel v1.27.4-1/go.mod h1:ekREo7U9TPHh86kbuPMaWA93NMyWsfVvP/iNT3XhAb8= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sanbornm/go-selfupdate v0.0.0-20210106163404-c9b625feac49 h1:LuxslTBxJrrNeKfqoywIERWWhH43TgiVAiPEVlhgNBA= github.com/sanbornm/go-selfupdate v0.0.0-20210106163404-c9b625feac49/go.mod h1:fY313ZGG810aWruFYcyq3coFpHDrWJVoMfSRI81y1r4= github.com/sandertv/go-raknet v1.12.0 h1:olUzZlIJyX/pgj/mrsLCZYjKLNDsYiWdvQ4NIm3z0DA= github.com/sandertv/go-raknet v1.12.0/go.mod h1:Gx+WgZBMQ0V2UoouGoJ8Wj6CDrMBQ4SB2F/ggpl5/+Y= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= -github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= -github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= -github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= -github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= -github.com/srwiley/oksvg v0.0.0-20220731023508-a61f04f16b76/go.mod h1:cNQ3dwVJtS5Hmnjxy6AgTPd0Inb3pW05ftPSX7NZO7Q= -github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c h1:km8GpoQut05eY3GiYWEedbTT0qnSxrCjsVbb7yKY1KE= -github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c/go.mod h1:cNQ3dwVJtS5Hmnjxy6AgTPd0Inb3pW05ftPSX7NZO7Q= -github.com/srwiley/rasterx v0.0.0-20210519020934-456a8d69b780/go.mod h1:mvWM0+15UqyrFKqdRjY6LuAVJR0HOVhJlEgZ5JWtSWU= -github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef h1:Ch6Q+AZUxDBCVqdkI8FSpFyZDtCVBc2VmejdNrm5rRQ= -github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef/go.mod h1:nXTWP6+gD5+LUJ8krVhhoeHjvHTutPxMYl5SvkcnJNE= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/tevino/abool v1.2.0 h1:heAkClL8H6w+mK5md9dzsuohKeXHUpY7Vw0ZCKW+huA= -github.com/tevino/abool v1.2.0/go.mod h1:qc66Pna1RiIsPa7O4Egxxs9OqkuxDX55zznh9K07Tzg= -github.com/urfave/cli/v2 v2.4.0/go.mod h1:NX9W0zmTvedE5oDoOMs2RTC8RvdK98NTYZE5LbaEYPg= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/yuin/goldmark v1.5.4 h1:2uY/xC0roWy8IBEGLgB1ywIoEJFGmRrX21YQcvGZzjU= -github.com/yuin/goldmark v1.5.4/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= golang.design/x/lockfree v0.0.1 h1:IHFNwZgM5bnZYWkEbzn5lWHMYr8WsRBdCJ/RBVY0xMM= golang.design/x/lockfree v0.0.1/go.mod h1:iaZUx6UgZaOdePjzI6wFd+seYMl1i0rsG8+xKvA8c4I= -golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20230304125523-9ff063c70017 h1:3Ea9SZLCB0aRIhSEjM+iaGIlzzeDJdpi579El/YIhEE= golang.org/x/exp v0.0.0-20230304125523-9ff063c70017/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/exp/shiny v0.0.0-20220827204233-334a2380cb91 h1:ryT6Nf0R83ZgD8WnFFdfI8wCeyqgdXWN4+CkFVNPAT0= +golang.org/x/exp/shiny v0.0.0-20220827204233-334a2380cb91/go.mod h1:VjAR7z0ngyATZTELrBSkxOOHhhlnVUxDye4mcjx5h/8= golang.org/x/image v0.0.0-20190321063152-3fc05d484e9f/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20210504121937-7319ad40d33e/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= -golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= -golang.org/x/image v0.0.0-20220601225756-64ec528b34cd/go.mod h1:doUCurBvlfPMKfmIpRIywoHmhN3VyhnoFDbvIEWF4hY= golang.org/x/image v0.6.0 h1:bR8b5okrPI3g/gyZakLZHeWxAR8Dn5CyxXv1hLH5g/4= golang.org/x/image v0.6.0/go.mod h1:MXLdDR43H7cDJq5GEGXEVeeNhPgi+YYEQ2pC1byI1x0= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mobile v0.0.0-20211207041440-4e6c2922fdee/go.mod h1:pe2sM7Uk+2Su1y7u/6Z8KJ24D7lepUjFZbhFOrmDfuQ= -golang.org/x/mobile v0.0.0-20230301163155-e0f57694e12c h1:Gk61ECugwEHL6IiyyNLXNzmu8XslmRP2dS0xjIYhbb4= -golang.org/x/mobile v0.0.0-20230301163155-e0f57694e12c/go.mod h1:aAjjkJNdrh3PMckS4B10TGS2nag27cbKR1y2BpUxsiY= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs= -golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211118161319-6a13c67c3ce4/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.6.0 h1:Lh8GPgSKBfWSwFvtuWOfeI3aAAnbXTSutYxJiOJFgIw= golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200428200454-593003d681fa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= @@ -584,220 +151,42 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.8-0.20211022200916-316ba0b74098/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k= golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= -google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= -google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= -google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= -google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= -google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= -google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= -google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= -google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inconshreveable/go-update.v0 v0.0.0-20150814200126-d8b0b1d421aa h1:drvf2JoUL1fz3ttkGNkw+rf3kZa2//7XkYGpSO4NHNA= gopkg.in/inconshreveable/go-update.v0 v0.0.0-20150814200126-d8b0b1d421aa/go.mod h1:tuNm0ntQ7IH9VSA39XxzLMpee5c2DwgIbjD4x3ydo8Y= -gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI= gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/js/dom v0.0.0-20210725211120-f030747120f2/go.mod h1:sUMDUKNB2ZcVjt92UnLy3cdGs+wDAcrPdV3JP6sVgA4= -honnef.co/go/js/dom v0.0.0-20221001195520-26252dedbe70 h1:2ZZFiPwRLxiNX2E/YO6Jgw1pCjDRDgmx20PGyw/cw+M= -honnef.co/go/js/dom v0.0.0-20221001195520-26252dedbe70/go.mod h1:sUMDUKNB2ZcVjt92UnLy3cdGs+wDAcrPdV3JP6sVgA4= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/subcommands/resourcepack-d/resourcepack-d.go b/subcommands/resourcepack-d/resourcepack-d.go index 674462cb7f3a4a3a417f2319d03f413228a2a1f8..f7d3b065bf3a640a8882466b64a88a6296dfdd9d 100644 GIT binary patch literal 5423 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 F)`=5=jIRIy diff --git a/subcommands/world/entity.go b/subcommands/world/entity.go index 266cb8f..8762075 100644 --- a/subcommands/world/entity.go +++ b/subcommands/world/entity.go @@ -44,6 +44,10 @@ func (t serverEntityType) EncodeNBT(e world.Entity) map[string]any { return t.NBT } +func (t serverEntityType) UniqueID() int64 { + return t.NBT["UniqueID"].(int64) +} + type serverEntity struct { world.Entity EntityType serverEntityType @@ -116,6 +120,7 @@ func (s *entityState) ToServerEntity() serverEntity { "Pos": vec3float32(s.Position), "Rotation": []float32{s.Yaw, s.Pitch}, "Motion": vec3float32(s.Velocity), + "UniqueID": int64(s.UniqueID), }, }, } diff --git a/subcommands/world/map_item.go b/subcommands/world/map_item.go index 8781618..ebbc71f 100644 --- a/subcommands/world/map_item.go +++ b/subcommands/world/map_item.go @@ -1,11 +1,9 @@ package world import ( - "bytes" "image" "image/draw" "math" - "os" "sync" "time" @@ -17,7 +15,6 @@ import ( "github.com/sandertv/gophertunnel/minecraft/protocol" "github.com/sandertv/gophertunnel/minecraft/protocol/packet" "github.com/sirupsen/logrus" - "golang.org/x/image/bmp" ) const ViewMapID = 0x424242 @@ -96,16 +93,7 @@ func NewMapUI(w *WorldState) *MapUI { } func (m *MapUI) Start() { - r := m.w.gui.Message(utils.InitMapName, utils.InitMapPayload{ - RLock: m.l.RLock, - RUnlock: m.l.RUnlock, - GetTiles: func() map[protocol.ChunkPos]*image.RGBA { - return m.renderedChunks - }, - GetBounds: func() (min, max protocol.ChunkPos) { - return m.GetBounds() - }, - }) + r := m.w.gui.Message("can_show_images", nil) if r.Ok { m.showOnGui = true } @@ -197,6 +185,7 @@ func (m *MapUI) SchedRedraw() { // Redraw draws chunk images to the map image func (m *MapUI) Redraw() { m.l.Lock() + updatedChunks := []protocol.ChunkPos{} for { r, ok := m.renderQueue.Dequeue().(*RenderElem) if !ok { @@ -207,6 +196,7 @@ func (m *MapUI) Redraw() { } else { m.renderedChunks[r.pos] = black16x16 } + updatedChunks = append(updatedChunks, r.pos) } m.l.Unlock() @@ -238,22 +228,17 @@ func (m *MapUI) Redraw() { } } ChunkCount := len(m.renderedChunks) - m.l.RUnlock() - - drawFull := false - - if drawFull { - img2 := m.ToImage() - buf := bytes.NewBuffer(nil) - bmp.Encode(buf, img2) - os.WriteFile("test.bmp", buf.Bytes(), 0o777) - } - if m.showOnGui { + min, max := m.GetBounds() m.w.gui.Message(utils.UpdateMapName, utils.UpdateMapPayload{ - ChunkCount: ChunkCount, + ChunkCount: ChunkCount, + UpdatedTiles: updatedChunks, + Tiles: m.renderedChunks, + BoundsMin: min, + BoundsMax: max, }) } + m.l.RUnlock() } func (m *MapUI) ToImage() *image.RGBA { diff --git a/subcommands/world/world.go b/subcommands/world/world.go index 8bd416c..6f7dba0 100644 --- a/subcommands/world/world.go +++ b/subcommands/world/world.go @@ -154,6 +154,9 @@ func (c *WorldCMD) Execute(ctx context.Context, ui utils.UI) error { proxy.AlwaysGetPacks = true proxy.ConnectCB = w.OnConnect + proxy.OnClientConnect = func(proxy *utils.ProxyContext, hasClient bool) { + w.gui.Message(utils.SetUIStateName, utils.UIStateConnecting) + } proxy.PacketCB = func(pk packet.Packet, proxy *utils.ProxyContext, toServer bool, _ time.Time) (packet.Packet, error) { forward := true @@ -174,6 +177,7 @@ func (c *WorldCMD) Execute(ctx context.Context, ui utils.UI) error { return pk, nil } + w.gui.Message(utils.SetUIStateName, utils.UIStateConnect) err = w.proxy.Run(ctx, serverAddress) if err != nil { return err @@ -256,6 +260,24 @@ func (w *WorldState) Reset() { // SaveAndReset writes the world to a folder, resets all the chunks func (w *WorldState) SaveAndReset() { + keys := make([]protocol.ChunkPos, 0, len(w.chunks)) + for cp := range w.chunks { + keys = append(keys, cp) + } + + for _, cp := range keys { + has_any := false + for _, sc := range w.chunks[cp].Sub() { + has_any = !sc.Empty() + if has_any { + break + } + } + if !has_any { + delete(w.chunks, cp) + } + } + if len(w.chunks) == 0 { w.Reset() return @@ -407,7 +429,10 @@ func (w *WorldState) SaveAndReset() { } provider.SaveSettings(s) - provider.Close() + if err = provider.Close(); err != nil { + logrus.Error(err) + } + w.worldCounter += 1 type dep struct { @@ -486,11 +511,13 @@ func (w *WorldState) SaveAndReset() { fmt.Println(err) } logrus.Info(locale.Loc("saved", locale.Strmap{"Name": filename})) - os.RemoveAll(folder) + //os.RemoveAll(folder) w.Reset() } func (w *WorldState) OnConnect(proxy *utils.ProxyContext, err error) bool { + w.gui.Message(utils.SetUIStateName, utils.UIStateMain) + if err != nil { return false } diff --git a/ui/gui.go b/ui/gui.go index 15732f1..f387758 100644 --- a/ui/gui.go +++ b/ui/gui.go @@ -4,198 +4,96 @@ package ui import ( "context" - "sync" + "time" - "fyne.io/fyne/v2/app" - "fyne.io/fyne/v2/container" - "fyne.io/fyne/v2/data/binding" - "fyne.io/fyne/v2/widget" - "github.com/bedrock-tool/bedrocktool/subcommands" - "github.com/bedrock-tool/bedrocktool/subcommands/skins" - "github.com/bedrock-tool/bedrocktool/subcommands/world" - "github.com/bedrock-tool/bedrocktool/ui/gui" + "gioui.org/app" + "gioui.org/font/gofont" + "gioui.org/io/system" + "gioui.org/layout" + "gioui.org/op" + "gioui.org/widget/material" + "github.com/bedrock-tool/bedrocktool/ui/gui/pages" + "github.com/bedrock-tool/bedrocktool/ui/gui/pages/settings" + "github.com/bedrock-tool/bedrocktool/ui/gui/pages/worlds" "github.com/bedrock-tool/bedrocktool/utils" - "golang.org/x/exp/slices" + "github.com/sirupsen/logrus" ) -var settings = map[string]func(utils.Command) *widget.Form{ - "worlds": func(cc utils.Command) *widget.Form { - c := cc.(*world.WorldCMD) - return widget.NewForm( - widget.NewFormItem( - "serverAddress", widget.NewEntryWithData(binding.BindString(&c.ServerAddress)), - ), widget.NewFormItem( - "", widget.NewCheckWithData("packs", binding.BindBool(&c.Packs)), - ), widget.NewFormItem( - "", widget.NewCheckWithData("void", binding.BindBool(&c.EnableVoid)), - ), widget.NewFormItem( - "", widget.NewCheckWithData("saveImage", binding.BindBool(&c.SaveImage)), - ), widget.NewFormItem( - "", widget.NewCheckWithData("experimentInventory", binding.BindBool(&c.ExperimentInventory)), - ), - ) - }, - "skins": func(cc utils.Command) *widget.Form { - c := cc.(*skins.SkinCMD) - return widget.NewForm( - widget.NewFormItem( - "serverAddress", widget.NewEntryWithData(binding.BindString(&c.ServerAddress)), - ), widget.NewFormItem( - "filter", widget.NewEntryWithData(binding.BindString(&c.Filter)), - ), - ) - }, - "capture": func(cc utils.Command) *widget.Form { - c := cc.(*subcommands.CaptureCMD) - return widget.NewForm( - widget.NewFormItem( - "serverAddress", widget.NewEntryWithData(binding.BindString(&c.ServerAddress)), - ), - ) - }, - "chat-log": func(cc utils.Command) *widget.Form { - c := cc.(*subcommands.ChatLogCMD) - return widget.NewForm( - widget.NewFormItem( - "serverAddress", widget.NewEntryWithData(binding.BindString(&c.ServerAddress)), - ), - widget.NewFormItem( - "", widget.NewCheckWithData("Verbose", binding.BindBool(&c.Verbose)), - ), - ) - }, - "debug-proxy": func(cc utils.Command) *widget.Form { - c := cc.(*subcommands.DebugProxyCMD) - return widget.NewForm( - widget.NewFormItem( - "serverAddress", widget.NewEntryWithData(binding.BindString(&c.ServerAddress)), - ), widget.NewFormItem( - "filter", widget.NewEntryWithData(binding.BindString(&c.Filter)), - ), - ) - }, - "packs": func(cc utils.Command) *widget.Form { - c := cc.(*subcommands.ResourcePackCMD) - return widget.NewForm( - widget.NewFormItem( - "serverAddress", widget.NewEntryWithData(binding.BindString(&c.ServerAddress)), - ), widget.NewFormItem( - "", widget.NewCheckWithData("saveEncrypted", binding.BindBool(&c.SaveEncrypted)), - ), widget.NewFormItem( - "", widget.NewCheckWithData("only-keys", binding.BindBool(&c.OnlyKeys)), - ), - ) - }, -} - type GUI struct { utils.BaseUI - commandUI gui.CommandUI + router pages.Router + cancel context.CancelFunc } func (g *GUI) Init() bool { + utils.SetCurrentUI(g) return true } -func (g *GUI) Start(ctx context.Context, cancel context.CancelFunc) error { - a := app.New() - w := a.NewWindow("Bedrocktool") +func (g *GUI) Start(ctx context.Context, cancel context.CancelFunc) (err error) { + g.cancel = cancel - debug := binding.BindBool(&utils.Options.Debug) - extra_debug := binding.BindBool(&utils.Options.ExtraDebug) + w := app.NewWindow( + app.Title("Bedrocktool"), + ) - entries := []string{} - forms := make(map[string]*widget.Form) - for k, c := range utils.ValidCMDs { - entries = append(entries, k) + tctx, _ := context.WithTimeout(ctx, 2*time.Second) - f := settings[k] - if f != nil { - forms[k] = f(c) - } - } - slices.Sort(entries) + g.router = pages.NewRouter(tctx, w.Invalidate) - selected := binding.NewString() - forms_box := container.NewVBox() - start_button := widget.NewButton("Start", nil) - l := sync.Mutex{} + g.router.Register("Settings", settings.New(&g.router)) + g.router.Register("worlds", worlds.New(&g.router)) - w.SetContent(container.NewVBox( - widget.NewRichTextFromMarkdown("## Settings"), - container.NewHBox( - widget.NewCheckWithData("Debug", debug), - widget.NewCheckWithData("extra-debug", extra_debug), - ), - container.NewHBox( - widget.NewRichTextFromMarkdown("Custom Userdata:"), - widget.NewEntryWithData(binding.BindString(&utils.Options.PathCustomUserData)), - ), - widget.NewRichTextFromMarkdown("# Commands"), - widget.NewSelect(entries, func(s string) { - l.Lock() - selected.Set(s) - forms_box.RemoveAll() - f := forms[s] - if f != nil { - forms_box.Add(forms[s]) + g.router.SwitchTo("Settings") + + go func() { + err = g.run(w) + }() + + go func() { + app.Main() + }() + + <-ctx.Done() + + return err +} + +func (g *GUI) run(w *app.Window) error { + th := material.NewTheme(gofont.Collection()) + var ops op.Ops + for { + select { + case e := <-w.Events(): + switch e := e.(type) { + case system.DestroyEvent: + return e.Err + case system.FrameEvent: + gtx := layout.NewContext(&ops, e) + g.router.Layout(gtx, th) + e.Frame(gtx.Ops) + case *system.DestroyEvent: + g.cancel() + g.router.Wg.Wait() + return nil } - l.Unlock() - }), - forms_box, - start_button, - )) - - wg := sync.WaitGroup{} - - start_button.OnTapped = func() { - sub, _ := selected.Get() - cmd := utils.ValidCMDs[sub] - if cmd == nil { - return + case <-g.router.Ctx.Done(): + logrus.Info("Closing") + g.cancel() + g.router.Wg.Wait() + return nil } - - u := gui.CommandUIs[sub] - if u != nil { - g.commandUI = u - u.Layout(w) - } else { - w.SetContent(container.NewCenter( - widget.NewRichTextFromMarkdown("# No UI yet, Look at the console."), - )) - } - - utils.InitDNS() - utils.InitExtraDebug(ctx) - - wg.Add(1) - go func() { - defer wg.Done() - cmd.Execute(ctx, g) - }() } - - w.SetCloseIntercept(func() { - cancel() - wg.Wait() - w.Close() - }) - - w.ShowAndRun() - return nil } func (g *GUI) Message(name string, data interface{}) utils.MessageResponse { - h := g.commandUI.Handler() - if h != nil { - r := h(name, data) - if r.Ok { - return r - } + r := g.router.Handler(name, data) + if r.Ok || r.Data != nil { + return r } - r := utils.MessageResponse{ + r = utils.MessageResponse{ Ok: false, Data: nil, } diff --git a/ui/gui/common.go b/ui/gui/common.go new file mode 100644 index 0000000..194757a --- /dev/null +++ b/ui/gui/common.go @@ -0,0 +1 @@ +package gui diff --git a/ui/gui/console_widget.go b/ui/gui/console_widget.go deleted file mode 100644 index fa4dfa3..0000000 --- a/ui/gui/console_widget.go +++ /dev/null @@ -1,36 +0,0 @@ -package gui - -import ( - "io" - "os" - - "fyne.io/fyne/v2" - "fyne.io/fyne/v2/widget" - "github.com/fyne-io/terminal" - "github.com/sirupsen/logrus" -) - -type consoleWidget struct { - widget.BaseWidget - - term *terminal.Terminal -} - -func (c *consoleWidget) CreateRenderer() fyne.WidgetRenderer { - return widget.NewSimpleRenderer(c.term) -} - -func newConsoleWidget() *consoleWidget { - rp, w := io.Pipe() - r := io.TeeReader(rp, os.Stdout) - logrus.SetOutput(w) - - term := terminal.New() - go term.RunWithConnection(nil, r) - - c := &consoleWidget{ - term: term, - } - c.ExtendBaseWidget(c) - return c -} diff --git a/ui/gui/map_widget.go b/ui/gui/map_widget.go deleted file mode 100644 index acb5c51..0000000 --- a/ui/gui/map_widget.go +++ /dev/null @@ -1,60 +0,0 @@ -package gui - -import ( - "image" - "image/draw" - - "fyne.io/fyne/v2" - "fyne.io/fyne/v2/canvas" - "fyne.io/fyne/v2/container" - "fyne.io/fyne/v2/widget" - "github.com/sandertv/gophertunnel/minecraft/protocol" -) - -type mapWidget struct { - widget.BaseWidget - - GetTiles func() map[protocol.ChunkPos]*image.RGBA - GetBounds func() (min, max protocol.ChunkPos) - - pixels image.Image - w, h int -} - -func (m *mapWidget) MinSize() fyne.Size { - return fyne.NewSize(128, 128) -} - -func (m *mapWidget) CreateRenderer() fyne.WidgetRenderer { - m.ExtendBaseWidget(m) - c := container.NewMax(canvas.NewRaster(m.draw)) - return widget.NewSimpleRenderer(c) -} - -func (m *mapWidget) draw(w, h int) image.Image { - if m.w != w || m.h != h { - m.pixels = image.NewNRGBA(image.Rect(0, 0, w, h)) - } - - if m.GetBounds == nil { - return m.pixels - } - - min, max := m.GetBounds() - //chunksX := int(max[0] - min[0] + 1) // how many chunk lengths is x coordinate - //chunksY := int(max[1] - min[1] + 1) - _ = max - - for pos, tile := range m.GetTiles() { - px := image.Pt( - int((pos[0]-min[0])*16), - int((pos[1]-min[1])*16), - ) - draw.Draw(m.pixels.(*image.NRGBA), image.Rect( - px.X, px.Y, - px.X+16, px.Y+16, - ), tile, image.Pt(0, 0), draw.Src) - } - - return m.pixels -} diff --git a/ui/gui/pages/page.go b/ui/gui/pages/page.go new file mode 100644 index 0000000..5809e77 --- /dev/null +++ b/ui/gui/pages/page.go @@ -0,0 +1,145 @@ +package pages + +import ( + "context" + "log" + "sync" + "time" + + "gioui.org/layout" + "gioui.org/op/paint" + "gioui.org/widget/material" + "gioui.org/x/component" + "github.com/bedrock-tool/bedrocktool/utils" +) + +type HandlerFunc = func(name string, data interface{}) utils.MessageResponse + +type Page interface { + Actions() []component.AppBarAction + Overflow() []component.OverflowAction + Layout(gtx layout.Context, th *material.Theme) layout.Dimensions + NavItem() component.NavItem + + // handle events from program + Handler() HandlerFunc +} + +type Router struct { + Ctx context.Context + Wg sync.WaitGroup + Invalidate func() + + pages map[string]Page + current string + *component.ModalNavDrawer + NavAnim component.VisibilityAnimation + *component.AppBar + *component.ModalLayer + NonModalDrawer, BottomBar bool +} + +func NewRouter(ctx context.Context, invalidate func()) Router { + modal := component.NewModal() + + nav := component.NewNav("Navigation Drawer", "This is an example.") + modalNav := component.ModalNavFrom(&nav, modal) + + bar := component.NewAppBar(modal) + //bar.NavigationIcon = icon.MenuIcon + + na := component.VisibilityAnimation{ + State: component.Invisible, + Duration: time.Millisecond * 250, + } + return Router{ + Ctx: ctx, + Invalidate: invalidate, + pages: make(map[string]Page), + ModalLayer: modal, + ModalNavDrawer: modalNav, + AppBar: bar, + NavAnim: na, + } +} + +func (r *Router) Register(tag string, p Page) { + r.pages[tag] = p + navItem := p.NavItem() + navItem.Tag = tag + if r.current == "" { + r.current = tag + r.AppBar.Title = navItem.Name + r.AppBar.SetActions(p.Actions(), p.Overflow()) + } + r.ModalNavDrawer.AddNavItem(navItem) +} + +func (r *Router) SwitchTo(tag string) { + p, ok := r.pages[tag] + if !ok { + return + } + navItem := p.NavItem() + r.current = tag + r.AppBar.Title = navItem.Name + r.AppBar.SetActions(p.Actions(), p.Overflow()) +} + +func (r *Router) Layout(gtx layout.Context, th *material.Theme) layout.Dimensions { + for _, event := range r.AppBar.Events(gtx) { + switch event := event.(type) { + case component.AppBarNavigationClicked: + if r.NonModalDrawer { + r.NavAnim.ToggleVisibility(gtx.Now) + } else { + r.ModalNavDrawer.Appear(gtx.Now) + r.NavAnim.Disappear(gtx.Now) + } + case component.AppBarContextMenuDismissed: + log.Printf("Context menu dismissed: %v", event) + case component.AppBarOverflowActionClicked: + log.Printf("Overflow action selected: %v", event) + } + } + if r.ModalNavDrawer.NavDestinationChanged() { + r.SwitchTo(r.ModalNavDrawer.CurrentNavDestination().(string)) + } + paint.Fill(gtx.Ops, th.Palette.Bg) + content := layout.Flexed(1, func(gtx layout.Context) layout.Dimensions { + return layout.Flex{}.Layout(gtx, + layout.Rigid(func(gtx layout.Context) layout.Dimensions { + gtx.Constraints.Max.X /= 3 + return r.NavDrawer.Layout(gtx, th, &r.NavAnim) + }), + layout.Flexed(1, func(gtx layout.Context) layout.Dimensions { + return r.pages[r.current].Layout(gtx, th) + }), + ) + }) + bar := layout.Rigid(func(gtx layout.Context) layout.Dimensions { + return r.AppBar.Layout(gtx, th, "Menu", "Actions") + }) + flex := layout.Flex{Axis: layout.Vertical} + if r.BottomBar { + flex.Layout(gtx, content, bar) + } else { + flex.Layout(gtx, bar, content) + } + r.ModalLayer.Layout(gtx, th) + return layout.Dimensions{Size: gtx.Constraints.Max} +} + +func (r *Router) Handler(name string, data interface{}) utils.MessageResponse { + page, ok := r.pages[r.current] + if ok { + return page.Handler()(name, data) + } + return utils.MessageResponse{} +} + +var Pages = map[string]func(*Router) Page{} + +func Register(name string, fun func(*Router) Page) { + Pages[name] = fun +} diff --git a/ui/gui/pages/settings/settings.go b/ui/gui/pages/settings/settings.go new file mode 100644 index 0000000..ced8b8c --- /dev/null +++ b/ui/gui/pages/settings/settings.go @@ -0,0 +1,180 @@ +package settings + +import ( + "image" + + "gioui.org/font/gofont" + "gioui.org/layout" + "gioui.org/unit" + "gioui.org/widget" + "gioui.org/widget/material" + "gioui.org/x/component" + "github.com/bedrock-tool/bedrocktool/ui/gui/pages" + "github.com/bedrock-tool/bedrocktool/ui/gui/settings" + "github.com/bedrock-tool/bedrocktool/utils" + "github.com/sirupsen/logrus" +) + +type ( + C = layout.Context + D = layout.Dimensions +) + +type Page struct { + *pages.Router + + cmdMenu struct { + show bool + open widget.Clickable + state *component.MenuState + items map[string]*widget.Clickable + selected string + } + + startButton widget.Clickable +} + +func New(router *pages.Router) *Page { + p := &Page{ + Router: router, + startButton: widget.Clickable{}, + } + + th := material.NewTheme(gofont.Collection()) + + options := make([]func(layout.Context) layout.Dimensions, 0, len(utils.ValidCMDs)) + p.cmdMenu.items = make(map[string]*widget.Clickable, len(utils.ValidCMDs)) + for k := range utils.ValidCMDs { + item := &widget.Clickable{} + p.cmdMenu.items[k] = item + options = append(options, component.MenuItem(th, item, k).Layout) + } + + p.cmdMenu.state = &component.MenuState{ + OptionList: layout.List{}, + Options: options, + } + + for _, su := range settings.Settings { + su.Init() + } + + return p +} + +var _ pages.Page = &Page{} + +func (p *Page) Actions() []component.AppBarAction { + return []component.AppBarAction{} +} + +func (p *Page) Overflow() []component.OverflowAction { + return []component.OverflowAction{} +} + +func (p *Page) NavItem() component.NavItem { + return component.NavItem{ + Name: "Settings", + //Icon: icon.OtherIcon, + } +} + +func (p *Page) Layout(gtx C, th *material.Theme) D { + if p.startButton.Clicked() { + if p.cmdMenu.selected != "" { + cmd, ok := utils.ValidCMDs[p.cmdMenu.selected] + if !ok { + logrus.Errorf("Cmd %s not found", p.cmdMenu.selected) + } + + if s, ok := settings.Settings[p.cmdMenu.selected]; ok { + s.Apply() + } + + p.Router.SwitchTo(p.cmdMenu.selected) + + p.Router.Wg.Add(1) + go func() { + defer p.Router.Wg.Done() + utils.InitDNS() + utils.InitExtraDebug(p.Router.Ctx) + + err := cmd.Execute(p.Router.Ctx, utils.CurrentUI) + if err != nil { + logrus.Error(err) + } + }() + } + } + + if p.cmdMenu.open.Clicked() { + p.cmdMenu.show = !p.cmdMenu.show + } + + for k, c := range p.cmdMenu.items { + if c.Clicked() { + p.cmdMenu.selected = k + p.cmdMenu.show = false + } + } + + return layout.UniformInset(7).Layout(gtx, func(gtx layout.Context) layout.Dimensions { + d := layout.Flex{Axis: layout.Vertical}.Layout(gtx, + // Select Command Button + layout.Rigid(func(gtx C) D { + str := p.cmdMenu.selected + if str == "" { + str = "Select Command" + } + btn := material.Button(th, &p.cmdMenu.open, str) + return btn.Layout(gtx) + }), + + layout.Flexed(1, func(gtx layout.Context) layout.Dimensions { + if p.cmdMenu.selected == "" { + return layout.Dimensions{} + } + s, ok := settings.Settings[p.cmdMenu.selected] + if !ok { + return layout.Center.Layout(gtx, material.H4(th, "No Settings Yet (Use CLI)").Layout) + } else { + return layout.UniformInset(15).Layout(gtx, func(gtx layout.Context) layout.Dimensions { + return s.Layout(gtx, th) + }) + } + }), + + // Start Button + layout.Rigid(func(gtx layout.Context) layout.Dimensions { + return layout.Center.Layout(gtx, func(gtx layout.Context) layout.Dimensions { + return layout.Inset{ + Top: unit.Dp(15), + Bottom: unit.Dp(15), + }.Layout(gtx, func(gtx layout.Context) layout.Dimensions { + gtx.Constraints = layout.Constraints{ + Min: image.Pt(300, 50), + Max: image.Pt(400, 50), + } + btn := material.Button(th, &p.startButton, "Start") + return btn.Layout(gtx) + }) + }) + }), + ) + + if p.cmdMenu.show { + component.Menu(th, p.cmdMenu.state).Layout(gtx) + } + + return d + }) +} + +func (p *Page) Handler() pages.HandlerFunc { + return func(name string, data interface{}) utils.MessageResponse { + return utils.MessageResponse{ + Ok: false, + Data: nil, + } + } +} diff --git a/ui/gui/pages/worlds/map.go b/ui/gui/pages/worlds/map.go new file mode 100644 index 0000000..022dff9 --- /dev/null +++ b/ui/gui/pages/worlds/map.go @@ -0,0 +1,78 @@ +package worlds + +import ( + "image" + "image/draw" + + "gioui.org/io/pointer" + "gioui.org/layout" + "gioui.org/op/paint" + "gioui.org/widget" + "github.com/bedrock-tool/bedrocktool/utils" + "github.com/sandertv/gophertunnel/minecraft/protocol" +) + +type Map struct { + pressed bool + + MapImage *image.RGBA + BoundsMin protocol.ChunkPos + BoundsMax protocol.ChunkPos +} + +func (m *Map) Layout(gtx layout.Context) layout.Dimensions { + // here we loop through all the events associated with this button. + for _, e := range gtx.Events(m) { + if e, ok := e.(pointer.Event); ok { + switch e.Type { + case pointer.Press: + m.pressed = true + case pointer.Release: + m.pressed = false + } + } + } + + return layout.Center.Layout(gtx, widget.Image{ + Src: paint.NewImageOp(m.MapImage), + Fit: widget.Contain, + Position: layout.Center, + }.Layout) +} + +func drawTile(img *image.RGBA, min, pos protocol.ChunkPos, tile *image.RGBA) { + px := image.Pt( + int((pos.X()-min[0])*16), + int((pos.Z()-min[0])*16), + ) + draw.Draw(img, image.Rect( + px.X, px.Y, + px.X+16, px.Y+16, + ), tile, image.Point{}, draw.Src) +} + +func (m *Map) Update(u *utils.UpdateMapPayload) { + needNewImage := false + if m.BoundsMin != u.BoundsMin { + needNewImage = true + m.BoundsMin = u.BoundsMin + } + if m.BoundsMax != u.BoundsMax { + needNewImage = true + m.BoundsMax = u.BoundsMax + } + + if needNewImage { + chunksX := int(m.BoundsMax[0] - m.BoundsMin[0] + 1) // how many chunk lengths is x coordinate + chunksY := int(m.BoundsMax[1] - m.BoundsMin[1] + 1) + m.MapImage = image.NewRGBA(image.Rect(0, 0, chunksX*16, chunksY*16)) + for pos, tile := range u.Tiles { + drawTile(m.MapImage, m.BoundsMin, pos, tile) + } + } else { + for _, pos := range u.UpdatedTiles { + tile := u.Tiles[pos] + drawTile(m.MapImage, m.BoundsMin, pos, tile) + } + } +} diff --git a/ui/gui/pages/worlds/worlds.go b/ui/gui/pages/worlds/worlds.go new file mode 100644 index 0000000..2abc412 --- /dev/null +++ b/ui/gui/pages/worlds/worlds.go @@ -0,0 +1,125 @@ +package worlds + +import ( + "gioui.org/layout" + "gioui.org/unit" + "gioui.org/widget/material" + "gioui.org/x/component" + "github.com/bedrock-tool/bedrocktool/ui/gui" + "github.com/bedrock-tool/bedrocktool/ui/gui/pages" + "github.com/bedrock-tool/bedrocktool/utils" +) + +type ( + C = layout.Context + D = layout.Dimensions +) + +type Page struct { + *pages.Router + + worldMap *Map + State utils.UIState + chunkCount int + voidGen bool + worldName string +} + +func New(router *pages.Router) *Page { + return &Page{ + Router: router, + worldMap: &Map{}, + } +} + +var _ pages.Page = &Page{} + +func (p *Page) Actions() []component.AppBarAction { + return []component.AppBarAction{} +} + +func (p *Page) Overflow() []component.OverflowAction { + return []component.OverflowAction{} +} + +func (p *Page) NavItem() component.NavItem { + return component.NavItem{ + Name: "About this library", + //Icon: icon.OtherIcon, + } +} + +func (p *Page) Layout(gtx C, th *material.Theme) D { + margin := layout.Inset{ + Top: unit.Dp(25), + Bottom: unit.Dp(25), + Right: unit.Dp(35), + Left: unit.Dp(35), + } + + switch p.State { + case utils.UIStateConnect: + // display login page + return margin.Layout(gtx, material.Label(th, 100, "connect Client").Layout) + case utils.UIStateConnecting: + // display connecting to server + return margin.Layout(gtx, material.Label(th, 100, "Connecting").Layout) + case utils.UIStateMain: + // show the main ui + return margin.Layout(gtx, func(gtx layout.Context) layout.Dimensions { + return layout.Flex{ + Axis: layout.Vertical, + }.Layout(gtx, + layout.Rigid(material.Label(th, 20, "World Downloader Basic UI").Layout), + layout.Flexed(1, p.worldMap.Layout), + ) + }) + } + + return layout.Flex{}.Layout(gtx) +} + +func (u *Page) handler(name string, data interface{}) utils.MessageResponse { + r := utils.MessageResponse{ + Ok: false, + Data: nil, + } + + switch name { + case utils.SetUIStateName: + state := data.(utils.UIState) + u.State = state + u.Router.Invalidate() + r.Ok = true + + case utils.InitName: + init := data.(utils.InitPayload) + _ = init + r.Ok = true + + case utils.UpdateMapName: + update_map := data.(utils.UpdateMapPayload) + u.chunkCount = update_map.ChunkCount + u.worldMap.Update(&update_map) + u.Router.Invalidate() + r.Ok = true + + case utils.SetVoidGenName: + set_void_gen := data.(utils.SetVoidGenPayload) + u.voidGen = set_void_gen.Value + u.Router.Invalidate() + r.Ok = true + + case utils.SetWorldNameName: + set_world_name := data.(utils.SetWorldNamePayload) + u.worldName = set_world_name.WorldName + u.Router.Invalidate() + r.Ok = true + + } + return r +} + +func (p *Page) Handler() gui.HandlerFunc { + return p.handler +} diff --git a/ui/gui/settings/register.go b/ui/gui/settings/register.go new file mode 100644 index 0000000..327064f --- /dev/null +++ b/ui/gui/settings/register.go @@ -0,0 +1,14 @@ +package settings + +import ( + "gioui.org/layout" + "gioui.org/widget/material" +) + +type SettingsUI interface { + Init() + Apply() + Layout(layout.Context, *material.Theme) layout.Dimensions +} + +var Settings = map[string]SettingsUI{} diff --git a/ui/gui/settings/worlds.go b/ui/gui/settings/worlds.go new file mode 100644 index 0000000..3e59a88 --- /dev/null +++ b/ui/gui/settings/worlds.go @@ -0,0 +1,43 @@ +package settings + +import ( + "gioui.org/layout" + "gioui.org/widget" + "gioui.org/widget/material" + "github.com/bedrock-tool/bedrocktool/subcommands/world" + "github.com/bedrock-tool/bedrocktool/utils" +) + +type worldSettings struct { + worlds *world.WorldCMD + + withPacks widget.Bool + voidGen widget.Bool + saveImage widget.Bool + serverAddress widget.Editor +} + +func (s *worldSettings) Init() { + s.worlds = utils.ValidCMDs["worlds"].(*world.WorldCMD) + s.serverAddress.SingleLine = true +} + +func (s *worldSettings) Apply() { + s.worlds.Packs = s.withPacks.Value + s.worlds.EnableVoid = s.voidGen.Value + s.worlds.SaveImage = s.saveImage.Value + s.worlds.ServerAddress = s.serverAddress.Text() +} + +func (s *worldSettings) Layout(gtx layout.Context, th *material.Theme) layout.Dimensions { + return layout.Flex{Axis: layout.Vertical}.Layout(gtx, + layout.Rigid(material.CheckBox(th, &s.withPacks, "with Packs").Layout), + layout.Rigid(material.CheckBox(th, &s.voidGen, "void Generator").Layout), + layout.Rigid(material.CheckBox(th, &s.saveImage, "save image").Layout), + layout.Rigid(material.Editor(th, &s.serverAddress, "server Address").Layout), + ) +} + +func init() { + Settings["worlds"] = &worldSettings{} +} diff --git a/ui/gui/uis.go b/ui/gui/uis.go index fddb024..e9e07bc 100644 --- a/ui/gui/uis.go +++ b/ui/gui/uis.go @@ -1,15 +1,11 @@ package gui import ( - "fyne.io/fyne/v2" + "gioui.org/layout" "github.com/bedrock-tool/bedrocktool/utils" ) -type HandlerFunc func(name string, data interface{}) utils.MessageResponse +type C = layout.Context +type D = layout.Dimensions -type CommandUI interface { - Layout(fyne.Window) - Handler() HandlerFunc -} - -var CommandUIs = map[string]CommandUI{} +type HandlerFunc = func(name string, data interface{}) utils.MessageResponse diff --git a/ui/gui/worlds.go b/ui/gui/worlds.go deleted file mode 100644 index 746d2c5..0000000 --- a/ui/gui/worlds.go +++ /dev/null @@ -1,122 +0,0 @@ -package gui - -import ( - "fyne.io/fyne/v2" - "fyne.io/fyne/v2/container" - "fyne.io/fyne/v2/data/binding" - "fyne.io/fyne/v2/widget" - "github.com/bedrock-tool/bedrocktool/utils" -) - -type worldsUI struct { - mapElement *mapWidget - pageB binding.String - voidGen binding.Bool - worldName binding.String - chunkCount binding.Int - returnMessage HandlerFunc - - logs *consoleWidget -} - -func (u *worldsUI) Layout(w fyne.Window) { - u.mapElement = &mapWidget{} - u.logs = newConsoleWidget() - - u.voidGen = binding.NewBool() - u.voidGen.AddListener(binding.NewDataListener(func() { - val, _ := u.voidGen.Get() - u.returnMessage(utils.SetVoidGenName, utils.SetVoidGenPayload{Value: val}) - })) - u.worldName = binding.NewString() - u.worldName.Set("world") - u.worldName.AddListener(binding.NewDataListener(func() { - val, _ := u.worldName.Get() - u.returnMessage(utils.SetWorldNameName, utils.SetWorldNamePayload{WorldName: val}) - })) - u.chunkCount = binding.NewInt() - - u.pageB = binding.NewString() - u.pageB.AddListener(binding.NewDataListener(func() { - page, _ := u.pageB.Get() - switch page { - case "login": - case "connect": - w.SetContent(container.NewVBox( - widget.NewRichTextFromMarkdown("# connect"), - u.logs, - )) - case "connecting": - w.SetContent(container.NewVBox( - widget.NewRichTextFromMarkdown("# Connecting"), - u.logs, - )) - case "map": - w.SetContent(container.NewVBox( - container.NewCenter( - widget.NewRichTextFromMarkdown("# World Downloader"), - ), - container.NewHBox( - widget.NewCheckWithData("void generator", u.voidGen), - widget.NewRichTextWithText("world name:"), - widget.NewEntryWithData(u.worldName), - widget.NewLabelWithData(binding.NewSprintf("Chunks: %d", u.chunkCount)), - ), - container.NewMax(u.mapElement), - container.NewMax(u.logs), - )) - } - })) - u.pageB.Set("connect") -} - -func (u *worldsUI) handler(name string, data interface{}) utils.MessageResponse { - r := utils.MessageResponse{ - Ok: false, - Data: nil, - } - - switch name { - case "need_login": - u.pageB.Set("login") - case utils.InitName: - init := data.(utils.InitPayload) - u.returnMessage = HandlerFunc(init.Handler) - - case utils.InitMapName: - init_map := data.(utils.InitMapPayload) - u.mapElement.GetBounds = init_map.GetBounds - u.mapElement.GetTiles = init_map.GetTiles - r.Ok = true - u.pageB.Set("map") - - case utils.UpdateMapName: - update_map := data.(utils.UpdateMapPayload) - u.chunkCount.Set(update_map.ChunkCount) - u.mapElement.Refresh() - r.Ok = true - - case utils.SetVoidGenName: - set_void_gen := data.(utils.SetVoidGenPayload) - u.voidGen.Set(set_void_gen.Value) - - case utils.SetWorldNameName: - set_world_name := data.(utils.SetWorldNamePayload) - u.worldName.Set(set_world_name.WorldName) - } - return r -} - -func (w *worldsUI) Handler() HandlerFunc { - return w.handler -} - -func dummyHandler(name string, data interface{}) utils.MessageResponse { - return utils.MessageResponse{} -} - -func init() { - CommandUIs["worlds"] = &worldsUI{ - returnMessage: dummyHandler, - } -} diff --git a/utils/behaviourpack/bp.go b/utils/behaviourpack/bp.go index 69717bd..eea97bb 100644 --- a/utils/behaviourpack/bp.go +++ b/utils/behaviourpack/bp.go @@ -26,17 +26,18 @@ func New(name string) *BehaviourPack { Manifest: &resource.Manifest{ FormatVersion: 2, Header: resource.Header{ - Name: "pack.name", - Description: "pack.description", + Name: name, + Description: "Adds Blocks, Items and Entities from the server to this world", UUID: utils.RandSeededUUID(name + "_datapack"), Version: [3]int{1, 0, 0}, MinimumGameVersion: [3]int{1, 19, 50}, }, Modules: []resource.Module{ { - Type: "data", - UUID: utils.RandSeededUUID(name + "_data_module"), - Version: [3]int{1, 0, 0}, + Type: "data", + UUID: utils.RandSeededUUID(name + "_data_module"), + Description: "Datapack", + Version: [3]int{1, 0, 0}, }, }, Dependencies: []resource.Dependency{}, diff --git a/utils/behaviourpack/entity.go b/utils/behaviourpack/entity.go index 042b415..c092b62 100644 --- a/utils/behaviourpack/entity.go +++ b/utils/behaviourpack/entity.go @@ -2,23 +2,23 @@ package behaviourpack import "github.com/sandertv/gophertunnel/minecraft/protocol" -type clientEntityDescription struct { +type EntityDescription struct { Identifier string `json:"identifier"` Spawnable bool `json:"is_spawnable"` Summonable bool `json:"is_summonable"` Experimental bool `json:"is_experimental"` } -type minecraftClientEntity struct { - Description clientEntityDescription `json:"description"` - ComponentGroups map[string]any `json:"component_groups"` - Components map[string]any `json:"components"` - Events map[string]any `json:"events,omitempty"` +type MinecraftEntity struct { + Description EntityDescription `json:"description"` + ComponentGroups map[string]any `json:"component_groups"` + Components map[string]any `json:"components"` + Events map[string]any `json:"events,omitempty"` } type entityBehaviour struct { - FormatVersion string `json:"format_version"` - MinecraftEntity minecraftClientEntity `json:"minecraft:client_entity"` + FormatVersion string `json:"format_version"` + MinecraftEntity MinecraftEntity `json:"minecraft:entity"` } type EntityIn struct { @@ -38,14 +38,14 @@ func (bp *BehaviourPack) AddEntity(entity EntityIn) { entry := entityBehaviour{ FormatVersion: bp.formatVersion, - MinecraftEntity: minecraftClientEntity{ - Description: clientEntityDescription{ + MinecraftEntity: MinecraftEntity{ + Description: EntityDescription{ Identifier: entity.Identifier, Spawnable: true, Summonable: true, Experimental: true, }, - ComponentGroups: nil, + ComponentGroups: make(map[string]any), Components: make(map[string]any), Events: nil, }, diff --git a/utils/command_register.go b/utils/command_register.go index 6b1da03..c7f9d31 100644 --- a/utils/command_register.go +++ b/utils/command_register.go @@ -28,7 +28,7 @@ func (c *cmdWrap) Synopsis() string { return c.cmd.Synopsis() } func (c *cmdWrap) SetFlags(f *flag.FlagSet) { c.cmd.SetFlags(f) } func (c *cmdWrap) Usage() string { return c.Name() + ": " + c.Synopsis() } func (c *cmdWrap) Execute(ctx context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus { - err := c.cmd.Execute(ctx, currentUI) + err := c.cmd.Execute(ctx, CurrentUI) if err != nil { logrus.Error(err) return 1 diff --git a/utils/iui.go b/utils/iui.go index 705085b..bcbab7e 100644 --- a/utils/iui.go +++ b/utils/iui.go @@ -41,10 +41,10 @@ func (u *BaseUI) ServerInput(ctx context.Context, server string) (string, string return address, name, err } -var currentUI UI +var CurrentUI UI func SetCurrentUI(ui UI) { - currentUI = ui + CurrentUI = ui } type InteractiveCLI struct { @@ -52,7 +52,7 @@ type InteractiveCLI struct { } func (c *InteractiveCLI) Init() bool { - currentUI = c + CurrentUI = c return true } diff --git a/utils/messages.go b/utils/messages.go index 6d89d2d..1482ee0 100644 --- a/utils/messages.go +++ b/utils/messages.go @@ -6,7 +6,17 @@ import ( "github.com/sandertv/gophertunnel/minecraft/protocol" ) -type HandlerFunc func(name string, data interface{}) MessageResponse +type UIState = int + +const ( + UIStateConnect = iota + UIStateConnecting + UIStateMain +) + +type HandlerFunc = func(name string, data interface{}) MessageResponse + +var SetUIStateName = "set_ui_state" var SetVoidGenName = "set_void_gen" @@ -26,23 +36,12 @@ type InitPayload struct { Handler HandlerFunc } -var InitMapName = "init_map" - -type InitMapPayload struct { - RLock func() - RUnlock func() - GetTiles func() map[protocol.ChunkPos]*image.RGBA - GetBounds func() (min, max protocol.ChunkPos) -} - var UpdateMapName = "update_map" type UpdateMapPayload struct { - ChunkCount int -} - -var SavingWorldName = "saving_world" - -type SavingWorldPayload struct { - Saving bool + ChunkCount int + UpdatedTiles []protocol.ChunkPos + Tiles map[protocol.ChunkPos]*image.RGBA + BoundsMin protocol.ChunkPos + BoundsMax protocol.ChunkPos } diff --git a/utils/packet_logger.go b/utils/packet_logger.go index fd9b388..b271731 100644 --- a/utils/packet_logger.go +++ b/utils/packet_logger.go @@ -57,6 +57,10 @@ var ( func dmpStruct(level int, inputStruct any, withType bool, isInList bool) (s string) { tBase := strings.Repeat("\t", level) + if inputStruct == nil { + return "nil" + } + ii := reflect.Indirect(reflect.ValueOf(inputStruct)) typeName := reflect.TypeOf(inputStruct).String() typeString := "" @@ -67,6 +71,19 @@ func dmpStruct(level int, inputStruct any, withType bool, isInList bool) (s stri } } + if strings.HasPrefix(typeName, "protocol.Optional") { + v := ii.MethodByName("Value").Call(nil) + val, set := v[0], v[1] + if !set.Bool() { + s += typeName + " Not Set" + } else { + s += typeName + "{\n" + tBase + "\t" + s += dmpStruct(level+1, val.Interface(), false, false) + s += "\n" + tBase + "}" + } + return + } + if ii.Kind() == reflect.Struct { if ii.NumField() == 0 { s += typeName + "{}" @@ -126,7 +143,8 @@ func dmpStruct(level int, inputStruct any, withType bool, isInList bool) (s stri } s += string(j) } else { - if !isInList { + is_array := ii.Kind() == reflect.Array + if !isInList && !is_array { s += typeString } s += fmt.Sprintf("%#v", ii.Interface()) @@ -135,6 +153,15 @@ func dmpStruct(level int, inputStruct any, withType bool, isInList bool) (s stri return s } +func DumpStruct(data interface{}) { + if FLog == nil { + return + } + + FLog.Write([]byte(dmpStruct(0, data, true, false))) + FLog.Write([]byte("\n\n\n")) +} + func PacketLogger(header packet.Header, payload []byte, src, dst net.Addr) { var pk packet.Packet if pkFunc, ok := pool[header.PacketID]; ok { diff --git a/utils/proxy.go b/utils/proxy.go index 57f33a5..9d679dc 100644 --- a/utils/proxy.go +++ b/utils/proxy.go @@ -62,7 +62,7 @@ type ProxyContext struct { // called for every packet PacketFunc PacketFunc - // called after game started + // called after client connected OnClientConnect ClientConnectCallback // called after game started ConnectCB ConnectCallback diff --git a/utils/utils.go b/utils/utils.go index fd897ea..96848e2 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -181,11 +181,8 @@ func WriteManifest(manifest *resource.Manifest, fpath string) error { return nil } -func CfbDecrypt(data []byte, key []byte) ([]byte, error) { - cipher, err := aes.NewCipher([]byte(key)) - if err != nil { - return nil, err - } +func CfbDecrypt(data []byte, key []byte) []byte { + cipher, _ := aes.NewCipher([]byte(key)) shiftRegister := append(key[:16], data...) iv := make([]byte, 16) @@ -195,7 +192,7 @@ func CfbDecrypt(data []byte, key []byte) ([]byte, error) { data[off] ^= iv[0] shiftRegister = shiftRegister[1:] } - return data, nil + return data } func InitExtraDebug(ctx context.Context) {