From b867221a6606752395eb714cefa694ded4ede390 Mon Sep 17 00:00:00 2001
From: olebeck <31539311+olebeck@users.noreply.github.com>
Date: Sat, 29 Apr 2023 17:12:13 +0200
Subject: [PATCH] add progress

---
 handlers/packet_logger.go                    |  17 +---
 subcommands/resourcepack-d/resourcepack-d.go | Bin 6136 -> 6841 bytes
 ui/gui/pages/packs/packs.go                  |  92 ++++++++++++++++---
 ui/messages/messages.go                      |  10 ++
 utils/proxy.go                               |  42 +++++++--
 5 files changed, 126 insertions(+), 35 deletions(-)

diff --git a/handlers/packet_logger.go b/handlers/packet_logger.go
index 62121a3..b537d12 100644
--- a/handlers/packet_logger.go
+++ b/handlers/packet_logger.go
@@ -2,7 +2,6 @@ package handlers
 
 import (
 	"bufio"
-	"bytes"
 	"io"
 	"net"
 	"os"
@@ -12,7 +11,6 @@ import (
 	"github.com/bedrock-tool/bedrocktool/utils"
 	"github.com/bedrock-tool/bedrocktool/utils/crypt"
 	"github.com/fatih/color"
-	"github.com/sandertv/gophertunnel/minecraft/protocol"
 	"github.com/sandertv/gophertunnel/minecraft/protocol/packet"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/exp/slices"
@@ -79,20 +77,11 @@ func NewDebugLogger(extraVerbose bool) *utils.ProxyHandler {
 			proxy = pc
 		},
 		PacketFunc: func(header packet.Header, payload []byte, src, dst net.Addr) {
-			var pk packet.Packet
-			if pkFunc, ok := pool[header.PacketID]; ok {
-				pk = pkFunc()
-			} else {
-				pk = &packet.Unknown{PacketID: header.PacketID, Payload: payload}
+			pk := utils.DecodePacket(header, payload)
+			if pk == nil {
+				return
 			}
 
-			defer func() {
-				if recoveredErr := recover(); recoveredErr != nil {
-					logrus.Errorf("%T: %s", pk, recoveredErr.(error))
-				}
-			}()
-			pk.Marshal(protocol.NewReader(bytes.NewBuffer(payload), 0))
-
 			if packetsLogF != nil {
 				dmpLock.Lock()
 				packetsLogF.Write([]byte(utils.DumpStruct(0, pk, true, false) + "\n\n\n"))
diff --git a/subcommands/resourcepack-d/resourcepack-d.go b/subcommands/resourcepack-d/resourcepack-d.go
index d72550a6ddaccd1c15e9e3e83821a0a95d01853a..fed4ea4fa44f96c1db87cde32b089f94e932282b 100644
GIT binary patch
literal 6841
zcmV;q8b;*+M@dveQdv+`0J+Ig_JcKyH7Bocnb0h`GYgPU9w`RBAX8!!g;-_r&Li!#
z)so+rQ?XD4P<RXCz5?Ms%(w5wy#<OzxRyQmQnwEl$7n*&O=+UZ@9*>V6A@uN{+nE>
z$950FsJU@Q)nGr)CHK-D4O6&SrF3!{R;Kk({FJt_J`V+D`8PjSm81?Z;F`P^Mvz{(
zB}O5{WR2B6-#4M0Co^k1?xBcdbArsI>ayzzH5>iYol;@ixP7EEBo@VE8nbB$nb1B|
z0HrjeGp?)ar2u-0QJ3YFpiF+#3mC5fkBMESGGdF>{m1AewH&j21-d(ZNbbS5E6Ml(
zVd?SizZX{u_qTX4YMG7BIDwV&6u)#U4<1=NW-0m6D3VCpKfQlyLzDg+PMs%t*BAyP
zFDWV#HDzWSAVr}ryH{tONt(XM#ae?d9Mz`iXgOi_q&Z{r{6|D}>*g~l<1V~$L6Qtr
z^3LWDxxt@T)%X`Iyt?p*?WlUE(`Do$UnBqsZkf>_8z^41DtqbW;XNxgLOSRTdhl&K
z%iv<1z$A}qre`#+&VesSlu%R?71eZ<*4<aD5q4Yix&7a;<2{N(2=Z1vpNpruxCb4g
z9O?OiqyaH+cS?sO?D`77s7(jMiCOGDig<fh!u69gf)d8s3br6k?K;Kmzbrj<x!A;0
z>R|$1NG;#VdLNVULj}1_sazN1Vv7Q#3z+R?x7{o-Y%O;@UFLe!cyYDe1r5ML&-(jV
z_~*L5sZg3jNCpd_))v7HSIzxVgyjal{@))xyad#3yQLT@pI!dxp@XKos-G-AFAZOY
zf~I33yOUMk@#f$IZ{=?^xR}ihnluYf!~9pTW>R$*w(Ch`0#aZ-HNEfO92B^Rf1;~K
zkmD&k@>-7PNTP6G?VLrmVM<_iF`#a;pbtMwU^+w$GBBIjSz}*=-htl^>o}(xT&~eg
zDQE1r*{Vp+a{9_RTEa9_oP@F@(fVL22!L$u#<3$YZ@M=~dTY!Yr)PQeoH@|9F*W0C
zP3$YLlmJed@E`botswEFf{SbSWn9qos^Q|Fe`RHScmP`jz35`2S~jS`!IN0@_@L{}
z6KtYBlPlGW(L=&Kj4BP#_MFyWM_dBOfKa}4iAyN9i5$26aCl}^Q2){)0cERY$@EwK
ziKK&(pMx!EtO)9kuwq)R$o$x$*!rMSnSs1#<l0VXc_uX`UiNWqctUx&xe@V2$+|8T
z9Y7U{uy%YV4BqSY-syuu*j8LYljL{6g64GYrAeS`&=f(k9)ZH+jPy0vFD(pR&-(2n
z7z+in4DvSdU5`A~l9Bdmxd%uKJFN#!ea1q-XL=e3*rHYk8BhQ2R{;aCK9Oj;YJ$sc
zCNo2+J*Ro3pS5oKj;oY^+;t{9ZmKz;xnitGM<DdxA`u@=LkqT8b`as#k5QlLEzMW0
zBv8)Y5BE_<ZRPkwi23&Epv6Q)!<1LG;uiHPQ54`=nQp1gVyA*})-K2f8IE@u4aUEB
zcnc~7+gT<*L3Er+qibDvMeq~tYtrgqyTP&40I!8V9zXL1UV&C=eJxv03fUY(>HzwF
zb!IU{puW@{qK3<2T$Zs1OBu}SP($~9(DqC5`y(t)KG9F`lyz_i$_m#f^oVdiXJ<tt
zxH`edr)U;}D<M3V?27_tUC%}?Q|j^;;3t=d7aZe;0>$+By?1SEnX{F*R~C2TWQov7
z!KKiO(@#rgZ5wJoZvJJCQR$YtbF`Z=O>&rtQOAD190@zJ|Lk^5T`S_yhRO29f~KC!
znHZ9z3N&MXho||-wbrgd9iM9LUIXo4vxl{8UI(;DNkb~YMnWy-Ph=v=056lw!2vY8
z8d{5}BUp^}tRnvvFI0lS^AXAhv*lWL(IhT{9nvl~OJ<%p)`2NOr_5h3CM*wCnjaH3
z<U>IyvcxFy>lJ3=Zz8sy36Edo_&NJUC#lZ@LJP@a)WuPPofbn9e*&k$wUUdSWaKH8
zQMeU)UOJWhvXdY`Ag9wd{x)vk&8=2ZHO2`TVuR(<y9mub1aVR68d{AIQ;&)duTk<)
z?~qr;8Q%$AI?d|mcb3|{`n<!yVH;bBl3NcCI~{)IkU(>Yn0;nqSJb}rnGk0;8>P$v
zR4DKVEe??u&fZPXCh!K9mgO`Uc(FQW3Y<l>aujq%5A=!GBXUSHvOT?*Mw&osHAXbd
zzj+WfI=uBtyrG${(XYAS;I*a@rUdL3w1gDg#B&;JXQjy|YU{|iJg2*DHDMxeQ;McO
zKJS@(wYfpils%zNdDGkJjY+);1kXiD)sXCw?|L4V5fApRl@*bGLRJnow)L+cboo-t
zNK=iJN-XqNvf8MmVYLa2gUlrRH|tX3$W&r~c$TG=^R%jGc)WI<l#mo(!=nW*Y(3Vz
zVBi8~Sm!F*lE*P#q;q@}1+6B}-2CBYGfY7e-EmYp8ntYv-mo)iM+#!E{Qt@o=L%7}
z&`wZ41*Ir$SbetMY{fBEaB+D@R_$!waszv?a-TE6!=EUX^yRHBgm@k}o0nOS^7%wl
za3yftSCf>a#ANzs1;%3H$8^h#d)cf^Rk81bz=~RZz<8%%sUo20u;@rylqs2&-FOJq
zA2mu^udM;#8>r4U6nX!$@kA^y{M-?Ya>Mr&G*1R8(+1wUQJ2Bx7-!dfgjnyXPLxrC
z#rlA1AJXsRH!&ekN&N=LIceq+FQ5*y)@fF8=}yJ%xcx$0@tGPTeAaqHnfk=_?e-o0
ztY@<=ZVRk)qpVdvKJ~4E(!T-M5nS{6V3MU?M0vYxZtHtCBzWanfrK_Xn9)J$Of}bT
zcF(}FV-lTTK9<E*A0ZRzTb}H)yzbx7@P|=8pQdS1awwmdN>-W6+)}RoY;WU}m*Yj2
z$77>Ff+#nG)0Atw$4`kDel+zC8`J;3;JhQ$s#PI3{Rs9w6JhoWEnx~eOeWO=jUlhs
z13A-`<ya!u-DIxHPqtXOx8xyg4TE$W13f+j2T4;~7YWpja0(p@%^~5KlNRoXI69zZ
zIUXJSGjjNFEy)6kF9-Skjz4IV<>Du8>}$#-dP+cEN$=8|cUn^4k(UDA_(%PP@{{Nv
z2~})Dhlkf|G?zmm2}%ar3O)bf^k$%g&Fn~k0w5YSs8Zp>iOj%RSyKj#`|OkEl9<ry
z(2m{VIRptlapY?86{T_1olpub8ZJ`bkPE%0Ji}dN-?3FY0S668wCDfdzq#kj&Vw|R
zctu-59FcNBPX3!RVm!rx_n6kr?=a8j%P&f4?o@AyZSBPh`mO$_4Cn*;da+h>WIw`d
zYi;ErF0h9agS4RdIn*>R`RiRe3&}#cw@>%ZPF*r_7rE7qfun>)7eL&s^-`mGA!V>q
zcXQo`&t!vyECgKOAv-&teu~gb*lM`sm`>d@R}9M-Kniz6JNpV4W>ZWN8;8hyfbi8)
zJ*;6g9yJ=WEDae`qdVA!e5w-s3{+qhR)3$7w5)>c(2=zpCJ^+>5{D|{*b&V0ZCIDw
zuRpug)Mbh%&75;y!OeH0?V6d8qY};J+)igQq~R4}c9@vFzij}tB8<2@AvGZ+%q~2T
z%K#oF{tT(#E#E${0Qlugjj21GAGtqQTpi!~ffme3?hP#JVcd$~)rP6B5Ohq@wNv*X
z7qJfMhi$j0aT;5_ErP_uAnCqCrQlvZiBYiZJ)k{Axnnvn33cXpKPnkRGqHW2VDwlt
z(LpNc{Ke8(ML_T4gh<~e=TzcJfefd=4JCidFiYdZ(Dddr?*BC|8F_VzBoy3H-R|ku
zGsxDyFmfSDdWbRFz65Uo0`meEyUxmw=ujQfuYG@z_{YciFQ#xgVZKheT@r5gWq*@W
zIPQVd0soqVhG#M#cMaM^4<#`z2&MFMgsbMZj%b8{_9pfdCkcM7OPl=I5dt&FGgo%@
zt)!jsF$@1nHt{O6ck%D_7o~o&uT?!<>qdtgyvKrNbLTb$iP2w4HFk`^$gb#HM~>+n
z`B6la-cD?EE@8ql5k*9X-P%qWWV;~p3@IilF_THGXSh&HDx#2L7I3BZp>y&0P8-~I
zmh4>8Jz#)z$O`zU^f0eYoE3s_@Ys1~0})EvNsI__ip{ASrI3z}H>FZ%ha2%GqrY_&
zL`{#t{1uC3U&NyTAhQ8239J`#^dN9KIwOY6UxawFcZ4Z^QT=97_vkBN;1D4u^ltqM
z4Aa!#IUi!6o{Qxvr;gb|M+L?-yHTMc(<Jx*?DU<SjMG`a9$^1p*f?hbA=~O0{bcJ<
zO((o~8#yTs<pvnCAny>kf-$L7hqXJSInx9OtaT#<_LU49`(!>)hBSC=LPP%ahuq%a
z?L~K<+?bq|0?D3p@C2KZxy<4zz0jAc0Q*`^8~xgSp6@<AZgT575dSe9MQo&e_~MD~
z__g2Kwrw+wMODpjaL~dc&4hy3+l?##cgKe67`-L0qf$mUhWB)nPOKlsx@{4hCs&iN
zU9_}oo(si1CDch&|AKyc>hhzVJ&8){=JMvkfEUFb(-Z*#4WVzR@33af2^<9eK31vB
zOn|Y`Qk5(Eug}=%eN&?>o{D?_i@d-71jVmq>EN2m&6yQvE?BpNdLAI#TB07hVfNKI
z3>H*HQWB2h8f&=TS0<wekMy+eLiaDjEe-uZ@<#8ViZ}E-SjnWoihcs}rhY+!)m83*
z-mkt%m=hwOZ5jx#snkLkkDgkO&R|_|yJOWWbf@SNf==qtzi|a!z(iu9wD;<r%<oFm
z5KS^@(;X|vXoLPRp*|q@dAaw96}c&-*eVh>;v--L%k)onD<c{+?cR-0zcbwF(`hF>
zH)X{mRVp$*Y26slJ~ivBpp;K((0qZ?DD6vx-k@BzSmjwB!^5B}U=#d;8Po#)pCS5)
z54YbeSO@naIpu2HVi|bf2L@*?8bRM^KuXKPG{1Wf@O>Bg!a@*8FaycHqADFJMtXGK
zJu^nnuA;*t^LRovw>es5HYF|}Y)6xT12uhvk$9eJv1j_w<E{TM`ac=Ria?Wsv!r;c
zy=rPnj-*7{&wd(RDI*x24c`<#nu_LZh+Uz*F!Doq)qpIE2u&MH;fRLb4*0F4Xf68H
zJy%a?nBn~bOzF{_R0j7*Q5#RURcuCi3wGfqUpSzC25O#wi6!o;KQ(ma1dP1SWN${$
zX*L>ff;g(`{i8S20-+F{>)UlodHu9<x55{fCzZN7Quc@Ri>MTX>Om1DZOs1yar}r;
zD=b^mX^1Eq>pB!-uHUul1mPh1l(y$9#5waXqBmG&F&7^A6`y>v=nmKV>t+KNqu~7*
zNc1RXg>2drvK#!)V;4>UA+g}q;rQy<qU7Y^49|<A(WVJ~*?Zy4NMb&%1`LGRsmIwP
z=-miK3uj`Jt#JnqcbA*mpzx)N7_{>50DJ;Hm3Y4%4bpbj(0!JE<(U~6Iv9KGepgLX
zfZ3tBeGxj(H_v%ptomF2OM3osQQltMx8x4XnGPLhzsb|t4rwjEK|~&UH$`)8jX#Y#
zIj2S}L)f_SQ2MwWZRLa_Zu%F6(;FV~b6i2X+tV|Vae5IU8jtijjc-2?TLrmB4KY>8
zdRWAA<K2ngMA?G`PP^^3`B~7IBB&b9QRncY;!+eNi}A?4OaOOO`6&+DYq?DTQkq7D
z=I&flpL8>wF=LQKp|$d~Q1Uo71C@En=o}lnon5)s`^qRZN9=OI%{$CEhFIXC+Mi2@
zje$~qlBt0ZyJZ(E(aRX=Mk7h5g9*4?@s}WPMt!g;+|x#8G*xBY*?mdPSyZ0o9_RU^
zq60~4ORa|gboe&VdP;)3u*9x~0}FRuEw)!}?Ve(cFQo!YyIVb9stk*)z-c)SV3YIy
z`&i@`+`4XMWP<r)*4;4#6k1s!&X^AWuI&aL=CmQL`(RWbMn=kb;h=VO10<`q&%sg$
zP;MvJsPyW3<9_;?GXWs79Rm`s2o=4{pLm<cq$uCdQ_-u7htS6Hg}g9S;SpC%$vG*g
zs1(@Oa;bA@7~0X^jDQ-Y#~`dRY9;dF66;q{;eA+u-+k-x?+A78-;`|OR31#{$8U&T
zl?#u5c#|`Ncg#6-6Nr9RJ`74<x0S|zxa~Tmg$N%96ImrLdsou;Ie3bL6JH7aK+MQs
z!mThwgmC;%UI4ftm>1&qSpNri8cs@{qeubcw{%R}<`^Smvl}#ai@Micgazt?(OIVA
z%Y>Kpu=SVL9$_>~i|EAXe277?vbvdp<^6b@g`~lRJ8m8vAtwQ4kP>^l#@>ZlGJ8?}
zIDL7)f2|>WpD~Y7mkZ#Lq2Kg_5^R_SEBAdYcbqK5s3YZT)|qs(r${jU+AEWDAAD;i
z!N1P()=h`Y5FWeMV*ke#o>)}JjaPlf_<rsRai9f0_y<c4;DQ`(>4w7HO$xB3Qk*ff
z@x{&^koa}%gp$x55HsgR$l^;2WiX@V&~R9b>Er@NGxE%065E)1n$5WClmqHiHw0-x
zN(T+cz1r6pZD^Vk5whp7^XME2br&dtZ-9B%H&f&^Qbg;!1Cs`?`L;zwIuesc9Y8Bw
zrD*LLHdv{hwDqu!)9p*>v_@>RRnnUwCZ~lg9GVu}1247J%&{gvt48fYw~S(=Tiide
zEPwMbq>Yb4CDW(@qp4Egwg=@+K=2<(uW@DfeIq$R`ak7id(*T!<<H;@SZw^qxSRp7
zw!t22Kkjf&L8?MUiw`T0FnI3<EYbYhV7w36l5LwSG}!$PImd_<K@C4+D^Cm4A=D{@
z#QZLi#1QW7AFQDaHV|47DEYRgKMXa)pb}IaZP}e8Q*pMq)zv9D7HF_RK&Ad+5*2oP
z)v|(fKF|$fK|v4UXJwUZV5YP>kTm78%T8jh;yvO%Qm;BEOv$unn6bA4UVKv)@<;Ns
zQT&$P&e+t^%XxjY4^tGZk9ZU&=s#2?_ZLfZKebg06Y9$6n;rq{K4QG~Vb}G0kDLH<
zB6PP8B=lSq_$Z*(+@Lf+D<^Cqq;BM`BWhKh{WQ;o&6NHwUsCqv?h~o^4UlPz1U)|u
zvo3E@S|SP<ef7%5Qt3*d=TGL^YT&;;M14T9pseF48s)NoL~)qnv&(VuR+)sWDHp@Q
z^(+H5#tm-z^-I$^J9X$TBX*^*R;7$NolDfKz&TCtv89?@X|f5twdUrLkZR<GY9Y|h
zK<Y~MsU58}xalLC0c=T>KnIc}lIZ;}y#^33gwsVt9&eU`J>(h)i;tQ-KQ~Fu!*Qj4
zby^~8THnnFm$?^eHlon}^#3TYmI^g7!$a4&*&BYTU7^%hdZjXMJInV6?93f+i57io
z%MXzg=h)*2GA!5w3fhyOnNozh{&c9i^g(w5;&iK-%Ung0n;3mM*VLHyRO*)J0Ejdh
zE2~QR`!N)T8D7_WriYV@xM#Rex*@CMM<YZ0p2nYNBA!lZ>H0SFb9KRTwnN}gr)gc_
zVP-b-;=pm%e5g4MpgH;Wtt7HYgZm&yt)vvf3pw4Pw}=`g-nuPR{ulG=g^<4b=D01s
z<Kfuu@jz|zF<-Nyr=$ar=J^EXj+nFPs)~V#<LwMwbTF7lATQxGssmLj??-i>9KAaG
z_r!kRJ+tgv^~etwAs@WcR*4Vya9&}mtky};Mii)Pz}*J-@1w90J%XGTwctI_SKMpw
z#;Nz2;e_<Fhf}ro{Fk6rr#NG91*={@WBkT~q;(K`#m0I>BdgzGJtw1%p%srauBQ}|
z4d^T&A)XE0243ZDy6Ss%_UcS2Z3r1?<Brx<%#-GXICXq=fPwEWCJfz7SH{)XuY-<x
zX@B4sAqg~l)Q$<JHPUZhXN>VeSRBvcxgIof)o%`P1f3u<XwbW0aNJ=KKmx7-5risS
z{$rD<V*ezysq<reK+I`ed#PNHUn8C*0DallgEWN5b?BKPd)h@*rP-cDbf_s)aTm<%
zU746@dV#2t%>)s1khTW=>V~hqWpU#B4LzwN8}_=L|BB)@pRsZ=A3%zP>5a<v+7qa=
zl_%=%h^aEAKo&SQ1eaPyAu#Yn)aalOsHj|Ycr3GX?rexflAE?VwEF>bEWrf7?5DH`
zawBQgR@-3TE8GkCPm~G)cpRztRy3la5{4s61`dHg$i2rW>^Hxqn?}F#4}Pakv4bh$
zYC)l!4%&$fYHXX8wYXE-E-L(<v991BxE^0xdM$ya)?#e1ZU)EgPlT)r;DaCTy*imf
zWkXoRgZ+jTg3%n}wFP*Ddi6ac3UJ#_4JI3IMNJ5Daa2HQW^H*aJqAn2sPB=RXj0#E
z$+KeS*sC>^l_`ImkdCM6MP<^y$GIw0Kfv^Y(>5T-#fVSG3xCy4zUlC8`h*$IWL2<-
zh_8VWS9C9Z?p2eLjQx#F@^UzL-Nz=(zbiE<!k&5y$Ikb0mnV-q3Vv&zmCM>?Kq^dj
zzs}##)eTk3GoBKbhO6U18)5qV3)b*};W`-Dy{LOPK~3Wc%raAG<M~#!X$wUg5NqY-
z(KAx&_hoNsP;b}r`GSfmB^qxZ^bZ%*q1^YM6<5ucSJkEb^>OS*kum*+%M_R`9PndI
z6N=ci4aP{s8l>A+0Q9&5DZkl1?_Sjp(ww)}XNN6HOviL#9O{>8+L$$3R9_3hFGQ(8
zI*MAa3r}kMyTbyM*q&oFl-xW(&_JXviv0u0h)6$HERTdSdS9jL#(zM2>%5AgW1e3Z
zI*kYr8~vVKh&>saP@gRSXJ9`flDnuuaKxz6GPYIqrV`<2bD^MPc(A@f`I25avso52
zf@$onG2oGMAhJI|X}r8B(?k<E47s}sxOqLwgP~u2II7qHnjFXAy8@O2oz3r2iwwb5
ze`e+0m&W7qRQ#34mXeya-VU4rCv<(YggPEV_oyhbo^-@h96ZLG$$;)hhJWH}<M-?n
zVW%K^y-$x8qC@RzOh-b%Y6?3JJ3JEWMFYbhGZvbxjW#G<J%T~EsdubE$kwrc+=Yuf
zK0dwTPO@BhB^tv52T^NU(`~=qZR_R}vhDlS=sQ9dPxl5fKwWD=7g$n+8Z3xTnr0%C
n-sqR1d?Ar!T<$U39J$lYH@?Rl!d*zh>kg(Tyo$1%_h4=>Bf~_R

literal 6136
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
KF*i&T0k3=8fd{t$

diff --git a/ui/gui/pages/packs/packs.go b/ui/gui/pages/packs/packs.go
index 47a7073..6a601f3 100644
--- a/ui/gui/pages/packs/packs.go
+++ b/ui/gui/pages/packs/packs.go
@@ -1,8 +1,10 @@
 package packs
 
 import (
+	"fmt"
 	"image"
 	"image/color"
+	"sort"
 	"sync"
 
 	"gioui.org/f32"
@@ -29,16 +31,21 @@ type Page struct {
 	State     messages.UIState
 	packsList widget.List
 	l         sync.Mutex
-	Packs     []*packEntry
+	Packs     map[string]*packEntry
 }
 
 type packEntry struct {
+	IsFinished bool
+	UUID       string
+
 	HasIcon bool
 	Icon    paint.ImageOp
-	Size    string
-	Name    string
-	Path    string
-	Err     error
+
+	Size   uint64
+	Loaded uint64
+	Name   string
+	Path   string
+	Err    error
 }
 
 func New(router *pages.Router) *Page {
@@ -49,6 +56,7 @@ func New(router *pages.Router) *Page {
 				Axis: layout.Vertical,
 			},
 		},
+		Packs: make(map[string]*packEntry),
 	}
 }
 
@@ -80,7 +88,25 @@ func drawPackIcon(ops *op.Ops, imageOp paint.ImageOp, bounds image.Point) {
 	paint.PaintOp{}.Add(ops)
 }
 
+func MulAlpha(c color.NRGBA, alpha uint8) color.NRGBA {
+	c.A = uint8(uint32(c.A) * uint32(alpha) / 0xFF)
+	return c
+}
+
 func drawPackEntry(gtx C, th *material.Theme, entry *packEntry) D {
+	var size = ""
+	var colorSize = th.Palette.Fg
+	if entry.IsFinished {
+		size = utils.SizeofFmt(float32(entry.Size))
+	} else {
+		size = fmt.Sprintf("%s / %s  %.02f%%",
+			utils.SizeofFmt(float32(entry.Size)),
+			utils.SizeofFmt(float32(entry.Size)),
+			float32(entry.Loaded)/float32(entry.Size)*100,
+		)
+		colorSize = color.NRGBA{0x00, 0xc9, 0xc9, 0xff}
+	}
+
 	return layout.UniformInset(5).Layout(gtx, func(gtx C) D {
 		return layout.Flex{Axis: layout.Horizontal}.Layout(gtx,
 			layout.Rigid(func(gtx C) D {
@@ -93,7 +119,13 @@ func drawPackEntry(gtx C, th *material.Theme, entry *packEntry) D {
 			layout.Flexed(1, func(gtx C) D {
 				return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
 					layout.Rigid(material.Label(th, th.TextSize, entry.Name).Layout),
-					layout.Rigid(material.Label(th, th.TextSize, entry.Size).Layout),
+					layout.Rigid(material.LabelStyle{
+						Text:           size,
+						Color:          colorSize,
+						SelectionColor: MulAlpha(th.Palette.ContrastBg, 0x60),
+						TextSize:       th.TextSize,
+						Shaper:         th.Shaper,
+					}.Layout),
 					layout.Rigid(func(gtx C) D {
 						if entry.Err != nil {
 							return material.LabelStyle{
@@ -118,8 +150,15 @@ func (p *Page) layoutFinished(gtx C, th *material.Theme) D {
 			layout.Flexed(1, func(gtx C) D {
 				p.l.Lock()
 				defer p.l.Unlock()
-				return material.List(th, &p.packsList).Layout(gtx, len(p.Packs), func(gtx C, index int) D {
-					entry := p.Packs[len(p.Packs)-index-1]
+
+				keys := make([]string, 0, len(p.Packs))
+				for k := range p.Packs {
+					keys = append(keys, k)
+				}
+				sort.Strings(keys)
+
+				return material.List(th, &p.packsList).Layout(gtx, len(keys), func(gtx C, index int) D {
+					entry := p.Packs[keys[index]]
 					return drawPackEntry(gtx, th, entry)
 				})
 			}),
@@ -137,7 +176,7 @@ func (p *Page) Layout(gtx C, th *material.Theme) D {
 
 	return margin.Layout(gtx, func(gtx layout.Context) layout.Dimensions {
 		switch p.State {
-		case messages.UIStateFinished:
+		case messages.UIStateMain:
 			return p.layoutFinished(gtx, th)
 		}
 		return layout.Dimensions{}
@@ -155,19 +194,44 @@ func (p *Page) Handler(data interface{}) messages.MessageResponse {
 		p.State = m
 		p.Router.Invalidate()
 		r.Ok = true
-	case messages.FinishedDownloadingPacks:
-		p.State = messages.UIStateFinished
+
+	case messages.InitialPacksInfo:
+		p.State = messages.UIStateMain
+		p.l.Lock()
 		for _, dp := range m.Packs {
 			e := &packEntry{
-				Name: dp.Name,
-				Size: utils.SizeofFmt(float32(dp.Size)),
+				IsFinished: false,
+				UUID:       dp.UUID,
+				Name:       dp.SubPackName + "v" + dp.Version,
+				Size:       dp.Size,
 			}
+			p.Packs[e.UUID] = e
+		}
+		p.l.Unlock()
+		p.Router.Invalidate()
+
+	case messages.PackDownloadProgress:
+		p.l.Lock()
+		e := p.Packs[m.UUID]
+		e.Loaded += m.LoadedAdd
+		if e.Loaded == e.Size {
+			e.IsFinished = true
+		}
+		p.l.Unlock()
+		p.Router.Invalidate()
+
+	case messages.FinishedDownloadingPacks:
+		p.l.Lock()
+		for _, dp := range m.Packs {
+			e := p.Packs[dp.UUID]
 			if dp.Icon != nil {
 				e.Icon = paint.NewImageOpFilter(dp.Icon, paint.FilterNearest)
 				e.HasIcon = true
 			}
-			p.Packs = append(p.Packs, e)
+			e.Err = dp.Err
+			e.IsFinished = true
 		}
+		p.l.Unlock()
 		p.Router.Invalidate()
 		r.Ok = true
 	}
diff --git a/ui/messages/messages.go b/ui/messages/messages.go
index 9a79a89..8db0de4 100644
--- a/ui/messages/messages.go
+++ b/ui/messages/messages.go
@@ -69,7 +69,17 @@ type SavingWorld struct {
 
 type CanShowImages struct{}
 
+type InitialPacksInfo struct {
+	Packs []protocol.TexturePackInfo
+}
+
+type PackDownloadProgress struct {
+	UUID      string
+	LoadedAdd uint64
+}
+
 type DownloadedPack struct {
+	UUID string
 	Name string
 	Path string
 	Size int
diff --git a/utils/proxy.go b/utils/proxy.go
index 973c4e8..be82234 100644
--- a/utils/proxy.go
+++ b/utils/proxy.go
@@ -1,6 +1,7 @@
 package utils
 
 import (
+	"bytes"
 	"context"
 	"encoding/base64"
 	"encoding/json"
@@ -70,6 +71,8 @@ type ProxyHandler struct {
 	OnClientConnect   func(conn minecraft.IConn)
 	SecondaryClientCB func(conn minecraft.IConn)
 
+	// called after server connected & downloaded resource packs
+	OnServerConnect func() (cancel bool)
 	// called after game started
 	ConnectCB func(err error) bool
 
@@ -351,11 +354,6 @@ func (p *ProxyContext) connectClient(ctx context.Context, serverAddress string,
 	return nil
 }
 
-func (p *ProxyContext) connectServer(ctx context.Context, serverAddress string, cdp *login.ClientData, packetFunc PacketFunc) (err error) {
-	p.Server, err = connectServer(ctx, serverAddress, cdp, p.AlwaysGetPacks, packetFunc)
-	return err
-}
-
 func (p *ProxyContext) Run(ctx context.Context, serverAddress, name string) (err error) {
 	if Options.Debug || Options.ExtraDebug {
 		p.AddHandler(NewDebugLogger(Options.ExtraDebug))
@@ -436,7 +434,7 @@ func (p *ProxyContext) Run(ctx context.Context, serverAddress, name string) (err
 			return err
 		}
 	} else {
-		err = p.connectServer(ctx, serverAddress, cdp, packetFunc)
+		p.Server, err = connectServer(ctx, serverAddress, cdp, p.AlwaysGetPacks, packetFunc)
 	}
 	if err != nil {
 		for _, handler := range p.handlers {
@@ -457,6 +455,16 @@ func (p *ProxyContext) Run(ctx context.Context, serverAddress, name string) (err
 	}
 	defer p.Server.Close()
 
+	for _, handler := range p.handlers {
+		if handler.OnServerConnect == nil {
+			continue
+		}
+		cancel := handler.OnServerConnect()
+		if cancel {
+			return nil
+		}
+	}
+
 	gd := p.Server.GameData()
 	for _, handler := range p.handlers {
 		if handler.GameDataModifier != nil {
@@ -475,7 +483,8 @@ func (p *ProxyContext) Run(ctx context.Context, serverAddress, name string) (err
 			continue
 		}
 		if !handler.ConnectCB(nil) {
-			return errors.New("Cancelled")
+			logrus.Info("Disconnecting")
+			return nil
 		}
 	}
 
@@ -525,3 +534,22 @@ func (p *ProxyContext) Run(ctx context.Context, serverAddress, name string) (err
 	wg.Wait()
 	return err
 }
+
+var pool = packet.NewPool()
+
+func DecodePacket(header packet.Header, payload []byte) packet.Packet {
+	var pk packet.Packet
+	if pkFunc, ok := pool[header.PacketID]; ok {
+		pk = pkFunc()
+	} else {
+		pk = &packet.Unknown{PacketID: header.PacketID, Payload: payload}
+	}
+
+	defer func() {
+		if recoveredErr := recover(); recoveredErr != nil {
+			logrus.Errorf("%T: %s", pk, recoveredErr.(error))
+		}
+	}()
+	pk.Marshal(protocol.NewReader(bytes.NewBuffer(payload), 0))
+	return pk
+}