From f8ca31e44d9277c6194181d918ea07f9f9aa69be Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sat, 3 Feb 2024 06:22:16 +0300
Subject: [PATCH 1/7] animated textures borders fix

---
 src/graphics/TextureAnimation.cpp | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/graphics/TextureAnimation.cpp b/src/graphics/TextureAnimation.cpp
index b158a6f9..6cdd8484 100644
--- a/src/graphics/TextureAnimation.cpp
+++ b/src/graphics/TextureAnimation.cpp
@@ -49,9 +49,30 @@ void TextureAnimator::update(float delta) {
 
             float srcPosY = elem.srcTexture->height - frame.size.y - frame.srcPos.y; // vertical flip
 
-            glBlitFramebuffer(frame.srcPos.x, srcPosY,			frame.srcPos.x + frame.size.x,	srcPosY + frame.size.y,
-                              frame.dstPos.x, frame.dstPos.y,	frame.dstPos.x + frame.size.x,	frame.dstPos.y + frame.size.y,
-                              GL_COLOR_BUFFER_BIT, GL_NEAREST);
+            // Extensions
+            const int ext = 2;
+            for (int y = -1; y <= 1; y++) {
+                for (int x = -1; x <= 1; x++) {
+                    if (x == 0 && y == 0)
+                        continue;
+                    glBlitFramebuffer(
+                        frame.srcPos.x, srcPosY, frame.srcPos.x + frame.size.x, srcPosY + frame.size.y,
+                        frame.dstPos.x+x*ext, frame.dstPos.y+y*ext,	
+                        frame.dstPos.x + frame.size.x+x*ext, frame.dstPos.y + frame.size.y+y*ext,
+                        GL_COLOR_BUFFER_BIT, GL_NEAREST
+                    );
+                }
+            }
+
+            glBlitFramebuffer(
+                frame.srcPos.x, srcPosY,
+                frame.srcPos.x + frame.size.x,	
+                srcPosY + frame.size.y,
+                frame.dstPos.x, frame.dstPos.y,	
+                frame.dstPos.x + frame.size.x,
+                frame.dstPos.y + frame.size.y,
+                GL_COLOR_BUFFER_BIT, GL_NEAREST
+            );
         }
         glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
         glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);

From 685aab6bb5b648b902f9ffb6d1241377bdaa3585 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sat, 3 Feb 2024 07:09:13 +0300
Subject: [PATCH 2/7] ContentPack::scan unhandled exception fix

---
 src/content/ContentPack.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/content/ContentPack.cpp b/src/content/ContentPack.cpp
index 087eb6cb..5e6f459c 100644
--- a/src/content/ContentPack.cpp
+++ b/src/content/ContentPack.cpp
@@ -97,7 +97,12 @@ void ContentPack::scan(fs::path rootfolder,
             continue;
         if (!is_pack(folder))
             continue;
-        packs.push_back(read(folder));
+        try {
+            packs.push_back(read(folder));
+        } catch (const contentpack_error& err) {
+            std::cerr << "package.json error at " << err.getFolder().u8string();
+            std::cerr << ": " << err.what() << std::endl;
+        }
     }
 }
 

From 6c5f664d36605a675091ea31c8af6ca8db9459d6 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sat, 3 Feb 2024 07:11:32 +0300
Subject: [PATCH 3/7] ContentPack::scan another unhandled exception fix

---
 src/content/ContentPack.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/content/ContentPack.cpp b/src/content/ContentPack.cpp
index 5e6f459c..b72930db 100644
--- a/src/content/ContentPack.cpp
+++ b/src/content/ContentPack.cpp
@@ -102,6 +102,8 @@ void ContentPack::scan(fs::path rootfolder,
         } catch (const contentpack_error& err) {
             std::cerr << "package.json error at " << err.getFolder().u8string();
             std::cerr << ": " << err.what() << std::endl;
+        } catch (const std::runtime_error& err) {
+            std::cerr << err.what() << std::endl;
         }
     }
 }

From 01df957859ff70c087b61fe52b9093d0961ee7e3 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sun, 4 Feb 2024 03:23:35 +0300
Subject: [PATCH 4/7] base pack textures update

---
 res/content/base/textures/blocks/dirt.png     | Bin 7176 -> 779 bytes
 res/content/base/textures/blocks/flower.png   | Bin 6439 -> 357 bytes
 .../base/textures/blocks/grass_side.png       | Bin 7420 -> 7842 bytes
 res/content/base/textures/blocks/leaves.png   | Bin 7624 -> 6541 bytes
 res/content/base/textures/blocks/stone.png    | Bin 6845 -> 6989 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/res/content/base/textures/blocks/dirt.png b/res/content/base/textures/blocks/dirt.png
index 6239e67cdb3fcf04988b0eb3215a3b2556938123..9fc51ad886ba3d044344e3825dccabb6a02a1d68 100644
GIT binary patch
delta 756
zcmV<Q0t@|!IEx05BYy(YNkl<Zc$_7Z*=`$05Jk_-^laS3Rg~mNfQ<x(^N>Ht2jmy>
z-N{1$!HNY_5-n~+&c5c7nWvtvuIj3DZ<{~=_`Q4GM$mQKUr#BkiudTmr0-)Ki)~bJ
z`7DcCXU2mbx3e)lw<b+bn8|Rcn8hi{S?>;1b%SpVNmk<;hkuVBu2nE5PBI+JVL2HQ
zXSvoE)2kk)XDU$DM4M&ZD%sU-@NhF{6n12ltE2&k;|a%h*&L3X(oE+@>cU`Nqmnc)
zX_WkMbIoSAr*2#9E@L(rs%Xhy&n31SLQ`-|QhL6}Y8_FGJxrSBWO+{5>p@%64-NaI
z;_Eu0Y#nw{Mt_ty^xclQvACO08H54*NS$N}<~(z#V9&P%uwWNgc&4RlY@T&XrKB%E
z4Kdz;$L}jV*P*U!hW#FkNgxKHPn@;{oy#sc!|C|-VZpccUN^K%h9PO?;8O}!pZ7z`
z?Q}?9mXbycI!Tk}lFBw04!5(B5=+X)r|L?nYccAFtbaBKY|9WOM?4#rk}@p{LEIkI
zz9AEfk+g4Ghzkox9*{W%wBes`E5YorwP$rLM=^5_C(^RQ+%G3IO)Xfd5@n7e!uLaI
zU0e=t_bE4vu|~6*UwL#==<QHT&X`JTGaWbr6)+!9cz*jKMLOwRNc%wZ_jz1x^<VP&
zPSD1o#((Qr+Ll~uc=@rz#OaxOBOWfH^sTBIOO;*MV;I24h0h^(czlVaQq4%FJA;<7
zaeWuF5!FT@yY8d{h9L0Nex;FO?q|zOEYFVO;q!j7@x6jUFytwV=zA(K>Kl>oi@L2q
zz}L4uQJgWCVg7!4p>6awJcp}+%Qm%n+F0Un&}}HS#*`D!$&Jw0Rm-VO=mnty7OA9k
z9EaaNO(bEC9}LLe*UY99Ui9x7`=Xe6Uhnw%ZmO#P``wlEQqCY#e)%xw-&c)jI}~wo
me(`)4=*4s_PuOgZ3I72brju)WbCOs90000<MNUMnLSTXu4Rv?`

literal 7176
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
XZqgz*LS`aXz&KYYcgG_8C9(en7_P_T

diff --git a/res/content/base/textures/blocks/flower.png b/res/content/base/textures/blocks/flower.png
index 38f070eb022b8dd663d3d9b8881534f084049da5..a69626dead1b7399f95f8a522b65cd8b15f686df 100644
GIT binary patch
delta 331
zcmV-R0kr<7GUWo0BYy!bNkl<Zc${Nlpb)Uo%z!(`HUEQX70c_4$ZVnvxUygA|BoL(
z88|rD8BT9k{Quz#KLZELE3mkZ<2^=#27okz07#>tLI;ph!SLe;1H+F$VnES*gk1o0
zwt!3}0|T=J1A{;Z0|(F$9m^BMc>$yu>;<4EkY<nzK&}Caqko43Rs%qqVO|hmr~vap
zVF2<5Q7!-l)S2Dp{{?tHGGt8uz%V0I0B9H=gNf@&;=BL?FvYHMk{Hg$Yk*&#-2Y9J
z9>Fzm3b5hQi)nygp8S6<b{4oHApWLF4;evxPIgv?mECvodjX_4qEs1}>KMU>zzhRv
z{{HhfhU>6;VMGPc7Ld)~Kl}zpAp^rVApMQuHv^XdD+9V_tOmeb0t=5li=N{QK%533
d0A9Ud006Gfhi5QKCAk0q002ovPDHLkV1lj?is%3U

literal 6439
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
C%3WUo

diff --git a/res/content/base/textures/blocks/grass_side.png b/res/content/base/textures/blocks/grass_side.png
index 802c1a8799dea75299f6c3f2324e65be9ee5ced8..553bd8b4fe79b91d9123742283df254af9ff6d7c 100644
GIT binary patch
delta 3071
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
N07*qoM6LruV1mh)pXUGo

delta 2953
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

diff --git a/res/content/base/textures/blocks/leaves.png b/res/content/base/textures/blocks/leaves.png
index 861fbcb7398bcea12c9e7f10eef00af56df0b9e7..3beaf7ab9ad7c6304fc4ac43642e7103c425cfa3 100644
GIT binary patch
delta 3345
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
b4^#dJq%}z@eG5pc00000NkvXXu0mjfl@BbK

delta 3662
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
XV)xsV(<8@!335@-RJTm$a_Ij7l(c)#

diff --git a/res/content/base/textures/blocks/stone.png b/res/content/base/textures/blocks/stone.png
index 5214e3e1126af2d13681b64a3c3bcb7f7aa9b84d..53620aa1da4445f79f98f1f02930faabdd40bc4f 100644
GIT binary patch
delta 2393
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
LNkvXXu0mjfPy=Q{

delta 2404
zcmV-q37huKHoY~FB!Aj^R9JLUVRs;Ka&Km7Y-J#Hd2nSQWq4_3004N}rB++E>?jER
zXB2k`g5qO1KH^$EgC73Hl#(i~^KrV9m4reCWN)zG`uCp>f8-)W1CB%V$$KN0OD<6s
zA)42f?>8EEzvmCLgbzLF0Ex=V*S>y6Kj$w!nh#5uMdCL@v475i@;Q*)v>!J^(~%t!
zkqB)XO4E>~*8olf`L!+MQw;B0DA()T)=uK<f$_58wyj3?-!4e@8jI2rT^6m8x3x0>
zJ01%*%K*xoERKnCXX|W`x3OtPA_@7HC%t4I^bxB2I_U!ymGHYBcC;MLDRxV;*Y8(7
zAb&^YPW_u_7k{TjpZY#cf!VS@p59yR_nu`J*?CE|pPO1+xh0ub#KmwOLF{=G<Y6%p
z?mNjHh1FG1Yo?kacg2JxaCLOpFk{E-{#L9KqN58ah(J^Yw4sbPP@*b`p<pLBb_zDx
zW~1O)Z`hqBjRkMF$yB(#Me*EFrb_u$aZJCz;kOHVAAhAF<sLOx5*N`(_UHnF+<410
zK?M6uD&GlS_kImrtsuxF%cDe+B(}Uv6vn3$*c)go6Is5ma>3B10ZEa#W(h_r!=a#t
zmeHdLL;+C}83mv$p_6q~1Oa5GCP9+3)(bX~hHF_8@SaLcq6X1RGZQ4(da1A|2xS4w
zITro|7k`CAnJqhJ_8d5J;_R(=p1t?MkEWP|4GsbaA3}&Bg&b{kk)w|x#+YJGl&myO
zPCkVcQ%X6D&n%X+tj;na=R(C6R~U*fp~R9(u0o&cDpy}ajWyNWsM#j{qxlwEY^mi7
zFQL-qF24K~u6U&@ccEIh&|T;5d+4#Jo)xtT>wj_o0yUhd(T&uY7!)<phOkWFXeT@{
z6Tk=@3gTfvAcUrYnThBe4de!9CQ19VOcEpy%o+~F1VMKpamR%n&<oLl-2cK2g8RUY
z{ws1Yp!+3qCvM+RYvUNIH)5|U97#1+s!v$U=y;UI6eM9oGU%@enW8MsWg9bn49Mvy
zhkwcx=n(u8azl76t4r0F6ZY}tBQBxkISFZMYMC0#9;Pmb755(7o5?(dv@8`~t2#`H
zSG<_k*defPrSo)>+Hwn1WmX_|d6U*YmzA}QmSC5Fno>As^V)#M-&aJM_qw)imSEvj
zEsI9|YqqWxZCobPngo71j@O<+@0SIq7Jtl2rKVy+0fzS>7j}W0CSc`6`EpGSJl>p+
z@wVNEoy(9k@`uzjBF&{&=7hYHQTLscOa4;>Z#-Ke;lV%^3hv}u3gECWFGr5FN_Fy6
zZ;e-u{PLC;OF6w2<0mJSw^~VV_5?6?-<fj5TuQ*DNxLtl1C(vAPxK2|OuTW%w135M
zt6@Mns$G#)A!{Ib5Nc5j%$~I;AN8mMzjF??4q>I=I>nlH&S?K+&Dv2aplw6rcSlDl
zM~<ITTQP#RbX7h5doO=;G$!qy1$eiU4qiWPxc?Zd1KbUTgGID+KldXG8TJf4Y3Tb2
zRS&|WmN~)hgdfm#){4X*CRc+N_<t8ej$@4Wf`1N?dUVco!M4nu{r$&tCS7lf;R6;f
z`(gTYa-HK25Y*7q?Pv?|A-4i`Hk-QuVMx3apJMx|Z#@4FQh#q8@b$P?DlaZs)GgYr
zqs;;Yjco{FPmz{Okbh1I{sJ2C%J$16s5k%s0fcEoLr_UWLm+T+Z)Rz1Wq$wwc$|Ha
zJxIeq9K~N#MbU~wD@bw3P@P&36>-!m6rn<>6<T#Lx%3N~G$bi5j)H5!!H>nNgNw7S
z4z7YA_yOYT;-u&zCH^ldw21ZKxF7HCJ?`ECLcPp1t7{z4blXfN;$kMdD)zjhA43Qt
zim=QqV@{Hi=s3Ra;p6LFjDKf!KKJJsP;(Xod?N8IGfbO!gLrz=HaPDShgeZoiO-3n
zCS8#Dk?V@bZ=4G*3p_Jqrc?98A!4!6#!4HrqNx#25l2)_r+gvfvC4UivsSLM<~{if
z137(Vnd>x1kia6AAVGwJDoQBBMvPXS6bmWZk9Y8gUB5&wg<K^ta(^tK0u8e32mgcL
z-CFs{2`?!S2fAMz=VKJ;*##Ok$N4^XoW=>@e+I7fmcLR5W<E);wY10)Ft`m|T(>l3
z54hX`hMx@ClwHYBQ^@Cm_cQvYED*c}`qsSOn)^6?0MgV|@&-6K1jY)Kz24#7z3sjI
zd#2gn51>PGxhA*EX9NHM5q7hU28seCW;Ho7W-~H0Ei^JTHZ3$VF=j1dHDzNhFg9W^
zWjQi6GGt*klRF8g4KOu1HZU_VF)%kXGcdF73AhEbiV$E379yclNdN!<24YJ`L;(K)
z{{a7>y{D6s86JP<3l$SD3Og&?d;kCfQb|NXR5;5$l1pyuFc1WbA4wD`O0j`tnM3B(
z0c_ZEOjBQyZ;==6W-*xQ?rQP%^;MQ-K?s3!ju<0C2$WLn`_8s)Y}-a%*Tfh}DKQKK
zF-F#PMJlCe+m;XlIcN5L2O#InJkQMYj1YpVs`&W$pzD7+)^)`g!})wh-tTvE&Ilp6
zTrSM>%s7q!2qCc6(sdm<XV!H+4u=pZr6BixXPPFYlvry~O3`&4Aq2G6%=3)379j+6
zUE`eN^YfFg>v%jKXzx8aXX?5JKx@squB4PuN}-hE`}-U3J-6G9QVJ<0N-6YxkBl+$
zd_Do_`<{OoBgPo&y5{wIp_IZoht?YB9L~AJ-m)y{wr%m=12B#w&N+-RXsub6<?w5*
z#ahcWO|)%GO6hk`2!WK6bzQ0Jno<ha>lG;_#u$t-oKB~MOxw21^UN>|TrL;n<ME)B
za-=GRplw^El=OX%5Q1?Wx!rDz<9HyP=lM4??>&FZvf#bv`FwIdpGhg<z2|<v)Av1E
zYjVz{ln5bERTU{Ex~@Z8YsopIlw#X9mSrKv$m{i@X&Qche$ZMIW5im^+uIveRk3Z`
zFX|A&aqSP=Fbqg3*|rTK#L)#QB_RabwnZt0_x`ua`@VC%UXLtt&Wz)Tl#)`)p&*2S
zG3IzsnNmVe(}cB_KP6RFG0!u9*$5#Hg#aN0oO6^?*tQKh48!m6ALZZ2ZQC%$P)flV
zgS8f|HSh25D5Z!ovMdX7nkG)C6LnqFG!0GD9Ib1bhH08u*OklVa#)m7G7JNCUGoqA
W3vjJAt0CV20000<MNUMnLSTYk<7TV?


From e9efdb0e7bec9fd5e7fa054c91b0f7fb14742154 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sun, 4 Feb 2024 03:31:11 +0300
Subject: [PATCH 5/7] missing-content panel scroll fix

---
 src/frontend/gui/GUI.cpp      |  2 +-
 src/frontend/gui/controls.cpp |  8 ++++----
 src/frontend/gui/panels.cpp   |  6 +++---
 src/frontend/gui/panels.h     |  4 ++--
 src/frontend/hud.cpp          |  2 +-
 src/frontend/menu.cpp         | 12 +++++++-----
 6 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/frontend/gui/GUI.cpp b/src/frontend/gui/GUI.cpp
index 8f7118a0..f0049a92 100644
--- a/src/frontend/gui/GUI.cpp
+++ b/src/frontend/gui/GUI.cpp
@@ -23,7 +23,7 @@ GUI::GUI() {
 
     menu = std::make_shared<PagesControl>();
     container->add(menu);
-    container->scrollable(false);
+    container->setScrollable(false);
 }
 
 GUI::~GUI() {
diff --git a/src/frontend/gui/controls.cpp b/src/frontend/gui/controls.cpp
index 6b6c2441..041def85 100644
--- a/src/frontend/gui/controls.cpp
+++ b/src/frontend/gui/controls.cpp
@@ -95,7 +95,7 @@ Button::Button(std::shared_ptr<UINode> content, glm::vec4 padding)
     setSize(content->getSize()+vec2(padding[0]+padding[2]+margin[0]+margin[2],
                                     padding[1]+padding[3]+margin[1]+margin[3]));
     add(content);
-    scrollable(false);
+    setScrollable(false);
     setHoverColor(glm::vec4(0.05f, 0.1f, 0.15f, 0.75f));
 }
 
@@ -117,7 +117,7 @@ Button::Button(
     if (action) {
         listenAction(action);
     }
-    scrollable(false);
+    setScrollable(false);
 
     label = std::make_shared<Label>(text);
     label->setAlign(Align::center);
@@ -253,7 +253,7 @@ void TextBox::drawBackground(const GfxContext* pctx, Assets* assets) {
         label->setColor(vec4(1.0f));
         label->setText(input);
     }
-    scrollable(false);
+    setScrollable(false);
 }
 
 void TextBox::typed(unsigned int codepoint) {
@@ -343,7 +343,7 @@ InputBindBox::InputBindBox(Binding& binding, vec4 padding)
       binding(binding) {
     label = std::make_shared<Label>(L"");
     add(label);
-    scrollable(false);
+    setScrollable(false);
 }
 
 void InputBindBox::drawBackground(const GfxContext* pctx, Assets* assets) {
diff --git a/src/frontend/gui/panels.cpp b/src/frontend/gui/panels.cpp
index 745c9120..23f82b0a 100644
--- a/src/frontend/gui/panels.cpp
+++ b/src/frontend/gui/panels.cpp
@@ -62,7 +62,7 @@ void Container::act(float delta) {
 
 void Container::scrolled(int value) {
     int diff = (actualLength-getSize().y);
-    if (diff > 0 && scrollable_) {
+    if (diff > 0 && scrollable) {
         scroll += value * 40;
         if (scroll > 0)
             scroll = 0;
@@ -74,8 +74,8 @@ void Container::scrolled(int value) {
     }
 }
 
-void Container::scrollable(bool flag) {
-    scrollable_ = flag;
+void Container::setScrollable(bool flag) {
+    scrollable = flag;
 }
 
 void Container::draw(const GfxContext* pctx, Assets* assets) {
diff --git a/src/frontend/gui/panels.h b/src/frontend/gui/panels.h
index 95316fb7..6c7b225c 100644
--- a/src/frontend/gui/panels.h
+++ b/src/frontend/gui/panels.h
@@ -30,7 +30,7 @@ namespace gui {
         std::vector<IntervalEvent> intervalEvents;
         int scroll = 0;
         int actualLength = 0;
-        bool scrollable_ = true;
+        bool scrollable = true;
     public:
         Container(glm::vec2 coord, glm::vec2 size);
 
@@ -43,7 +43,7 @@ namespace gui {
         virtual void add(std::shared_ptr<UINode> node, glm::vec2 coord);
         virtual void remove(std::shared_ptr<UINode> node);
         virtual void scrolled(int value) override;
-        virtual void scrollable(bool flag);
+        virtual void setScrollable(bool flag);
         void listenInterval(float interval, ontimeout callback, int repeat=-1);
         virtual glm::vec2 contentOffset() override {return glm::vec2(0.0f, scroll);};
         virtual void setSize(glm::vec2 size);
diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp
index 25e71300..5792e626 100644
--- a/src/frontend/hud.cpp
+++ b/src/frontend/hud.cpp
@@ -276,7 +276,7 @@ HudRenderer::HudRenderer(Engine* engine, LevelFrontend* frontend)
     );
     contentAccessPanel->setColor(glm::vec4());
     contentAccessPanel->add(contentAccess);
-    contentAccessPanel->scrollable(true);
+    contentAccessPanel->setScrollable(true);
 
     hotbarView = createHotbar();
     inventoryView = createInventory();
diff --git a/src/frontend/menu.cpp b/src/frontend/menu.cpp
index ed74fcd4..1f1e29c0 100644
--- a/src/frontend/menu.cpp
+++ b/src/frontend/menu.cpp
@@ -96,6 +96,9 @@ static void show_content_missing(
 
     auto subpanel = std::make_shared<Panel>(vec2(500, 100));
     subpanel->setColor(vec4(0.0f, 0.0f, 0.0f, 0.5f));
+    subpanel->setScrollable(true);
+    subpanel->setMaxLength(400);
+    panel->add(subpanel);
 
     for (auto& entry : lut->getMissingContent()) {
         auto hpanel = std::make_shared<Panel>(vec2(500, 30));
@@ -112,8 +115,7 @@ static void show_content_missing(
         hpanel->add(namelabel);
         subpanel->add(hpanel);
     }
-    subpanel->setMaxLength(400);
-    panel->add(subpanel);
+
 
     panel->add(std::make_shared<Button>(
         langs::get(L"Back to Main Menu", L"menu"), vec4(8.0f), [=](GUI*){
@@ -143,7 +145,7 @@ void show_convert_request(
 void create_languages_panel(Engine* engine) {
     auto menu = engine->getGUI()->getMenu();
     auto panel = create_page(engine, "languages", 400, 0.5f, 1);
-    panel->scrollable(true);
+    panel->setScrollable(true);
 
     std::vector<std::string> locales;
     for (auto& entry : langs::locales_info) {
@@ -211,7 +213,7 @@ void open_world(std::string name, Engine* engine) {
 }
 
 std::shared_ptr<Panel> create_worlds_panel(Engine* engine) {
-    auto panel = std::make_shared<Panel>(vec2(390, 200), vec4(5.0f));
+    auto panel = std::make_shared<Panel>(vec2(390, 0), vec4(5.0f));
     panel->setColor(vec4(1.0f, 1.0f, 1.0f, 0.07f));
     panel->setMaxLength(400);
 
@@ -278,7 +280,7 @@ std::shared_ptr<Panel> create_packs_panel(
     auto panel = std::make_shared<Panel>(vec2(PACKS_PANEL_WIDTH, 200), vec4(5.0f));
     panel->setColor(vec4(1.0f, 1.0f, 1.0f, 0.07f));
     panel->setMaxLength(400);
-    panel->scrollable(true);
+    panel->setScrollable(true);
 
     for (auto& pack : packs) {
         auto packpanel = std::make_shared<RichButton>(vec2(390, 80));

From 86412a28ecc089282e0f13f12b39011abee89f00 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sun, 4 Feb 2024 05:00:29 +0300
Subject: [PATCH 6/7] UiXmlReader added (WIP)

---
 src/frontend/gui/controls.cpp |  16 ++-
 src/frontend/gui/controls.h   |   7 +-
 src/frontend/gui/gui_xml.cpp  | 222 ++++++++++++++++++++++++++++++++++
 src/frontend/gui/gui_xml.h    |  31 +++++
 src/frontend/hud.cpp          |   2 +-
 src/frontend/menu.cpp         |   4 +-
 6 files changed, 269 insertions(+), 13 deletions(-)
 create mode 100644 src/frontend/gui/gui_xml.cpp
 create mode 100644 src/frontend/gui/gui_xml.h

diff --git a/src/frontend/gui/controls.cpp b/src/frontend/gui/controls.cpp
index 041def85..e05c66d2 100644
--- a/src/frontend/gui/controls.cpp
+++ b/src/frontend/gui/controls.cpp
@@ -97,6 +97,7 @@ Button::Button(std::shared_ptr<UINode> content, glm::vec4 padding)
     add(content);
     setScrollable(false);
     setHoverColor(glm::vec4(0.05f, 0.1f, 0.15f, 0.75f));
+    content->setInteractive(false);
 }
 
 Button::Button(
@@ -122,6 +123,7 @@ Button::Button(
     label = std::make_shared<Label>(text);
     label->setAlign(Align::center);
     label->setSize(size-vec2(padding.z+padding.x, padding.w+padding.y));
+    label->setInteractive(false);
     add(label);
     setHoverColor(glm::vec4(0.05f, 0.1f, 0.15f, 0.75f));
 }
@@ -161,10 +163,6 @@ void Button::drawBackground(const GfxContext* pctx, Assets* assets) {
     batch->rect(coord.x, coord.y, size.x, size.y);
 }
 
-std::shared_ptr<UINode> Button::getAt(vec2 pos, std::shared_ptr<UINode> self) {
-    return UINode::getAt(pos, self);
-}
-
 void Button::mouseRelease(GUI* gui, int x, int y) {
     UINode::mouseRelease(gui, x, y);
     if (isInside(vec2(x, y))) {
@@ -219,6 +217,7 @@ TextBox::TextBox(std::wstring placeholder, vec4 padding)
       input(L""),
       placeholder(placeholder) {
     label = std::make_shared<Label>(L"");
+    label->setSize(size-vec2(padding.z+padding.x, padding.w+padding.y));
     add(label);
     setHoverColor(glm::vec4(0.05f, 0.1f, 0.2f, 0.75f));
 }
@@ -289,6 +288,11 @@ void TextBox::focus(GUI* gui) {
     }
 }
 
+void TextBox::refresh() {
+    Panel::refresh();
+    label->setSize(size-vec2(padding.z+padding.x, padding.w+padding.y));
+}
+
 void TextBox::keyPressed(int key) {
     if (key == keycode::BACKSPACE) {
         if (!input.empty()){
@@ -327,13 +331,13 @@ void TextBox::textValidator(wstringchecker validator) {
     this->validator = validator;
 }
 
-std::wstring TextBox::text() const {
+std::wstring TextBox::getText() const {
     if (input.empty())
         return placeholder;
     return input;
 }
 
-void TextBox::text(std::wstring value) {
+void TextBox::setText(std::wstring value) {
     this->input = value;
 }
 
diff --git a/src/frontend/gui/controls.h b/src/frontend/gui/controls.h
index 970e203a..281ec1ee 100644
--- a/src/frontend/gui/controls.h
+++ b/src/frontend/gui/controls.h
@@ -70,8 +70,6 @@ namespace gui {
 
         virtual void drawBackground(const GfxContext* pctx, Assets* assets) override;
 
-        virtual std::shared_ptr<UINode> getAt(glm::vec2 pos, std::shared_ptr<UINode> self) override;
-
         virtual void mouseRelease(GUI*, int x, int y) override;
         virtual Button* listenAction(onaction action);
 
@@ -123,13 +121,14 @@ namespace gui {
         virtual void textConsumer(wstringconsumer consumer);
         virtual void textValidator(wstringchecker validator);
         virtual bool isFocuskeeper() const override {return true;}
-        virtual std::wstring text() const;
-        virtual void text(std::wstring value);
+        virtual std::wstring getText() const;
+        virtual void setText(std::wstring value);
         virtual bool validate();
         virtual void setValid(bool valid);
         virtual bool isValid() const;
         virtual void setOnEditStart(runnable oneditstart);
         virtual void focus(GUI*) override;
+        virtual void refresh() override;
     };
 
     class InputBindBox : public Panel {
diff --git a/src/frontend/gui/gui_xml.cpp b/src/frontend/gui/gui_xml.cpp
new file mode 100644
index 00000000..6601ad22
--- /dev/null
+++ b/src/frontend/gui/gui_xml.cpp
@@ -0,0 +1,222 @@
+#include "gui_xml.h"
+
+#include <charconv>
+#include <stdexcept>
+
+#include "panels.h"
+#include "controls.h"
+
+#include "../locale/langs.h"
+#include "../../logic/scripting/scripting.h"
+#include "../../util/stringutil.h"
+
+using namespace gui;
+
+static double readDouble(const std::string& str, size_t offset, size_t len) {
+    double value;
+    auto res = std::from_chars(str.data()+offset, str.data()+offset+len, value);
+    if (res.ptr != str.data()+offset+len) {
+        throw std::runtime_error("invalid number format "+escape_string(str));
+    }
+    return value;
+}
+
+/* Read 2d vector formatted `x,y`*/
+static glm::vec2 readVec2(const std::string& str) {
+    size_t pos = str.find(',');
+    if (pos == std::string::npos) {
+        throw std::runtime_error("invalid vec2 value "+escape_string(str));
+    }
+    return glm::vec2(
+        readDouble(str, 0, pos),
+        readDouble(str, pos+1, str.length()-pos-1)
+    );
+}
+
+/* Read 3d vector formatted `x,y,z`*/
+[[maybe_unused]]
+static glm::vec3 readVec3(const std::string& str) {
+    size_t pos1 = str.find(',');
+    if (pos1 == std::string::npos) {
+        throw std::runtime_error("invalid vec3 value "+escape_string(str));
+    }
+    size_t pos2 = str.find(',', pos1+1);
+    if (pos2 == std::string::npos) {
+        throw std::runtime_error("invalid vec3 value "+escape_string(str));
+    }
+    return glm::vec3(
+        readDouble(str, 0, pos1),
+        readDouble(str, pos1+1, pos2),
+        readDouble(str, pos2+1, str.length()-pos2-1)
+    );
+}
+
+/* Read 4d vector formatted `x,y,z,w`*/
+static glm::vec4 readVec4(const std::string& str) {
+    size_t pos1 = str.find(',');
+    if (pos1 == std::string::npos) {
+        throw std::runtime_error("invalid vec4 value "+escape_string(str));
+    }
+    size_t pos2 = str.find(',', pos1+1);
+    if (pos2 == std::string::npos) {
+        throw std::runtime_error("invalid vec4 value "+escape_string(str));
+    }
+    size_t pos3 = str.find(',', pos2+1);
+    if (pos3 == std::string::npos) {
+        throw std::runtime_error("invalid vec4 value "+escape_string(str));
+    }
+    return glm::vec4(
+        readDouble(str, 0, pos1),
+        readDouble(str, pos1+1, pos2-pos1-1),
+        readDouble(str, pos2+1, pos3-pos2-1),
+        readDouble(str, pos3+1, str.length()-pos3-1)
+    );
+}
+
+/* Read RGBA color. Supported formats:
+   - "#RRGGBB" or "#RRGGBBAA" hex color */
+static glm::vec4 readColor(const std::string& str) {
+    if (str[0] == '#') {
+        if (str.length() != 7 && str.length() != 9) {
+            throw std::runtime_error("#RRGGBB or #RRGGBBAA required");
+        }
+        int a = 255;
+        int r = (hexchar2int(str[1]) << 4) | hexchar2int(str[2]);
+        int g = (hexchar2int(str[3]) << 4) | hexchar2int(str[4]);
+        int b = (hexchar2int(str[5]) << 4) | hexchar2int(str[6]);
+        if (str.length() == 9) {
+            a = (hexchar2int(str[7]) << 4) | hexchar2int(str[8]);
+        }
+        return glm::vec4(
+            r / 255.f,
+            g / 255.f,
+            b / 255.f,
+            a / 255.f
+        );
+    } else {
+        throw std::runtime_error("hex colors are only supported");
+    }
+}
+
+/* Read basic UINode properties */
+static void readUINode(xml::xmlelement element, UINode& node) {
+    if (element->has("coord")) {
+        node.setCoord(readVec2(element->attr("coord").getText()));
+    }
+    if (element->has("size")) {
+        node.setSize(readVec2(element->attr("size").getText()));
+    }
+    if (element->has("color")) {
+        node.setColor(readColor(element->attr("color").getText()));
+    }
+}
+
+static void _readContainer(UiXmlReader& reader, xml::xmlelement element, Container& container) {
+    readUINode(element, container);
+
+    for (auto& sub : element->getElements()) {
+        if (sub->isText())
+            continue;
+        container.add(reader.readUINode(sub));
+    }
+}
+
+static void _readPanel(UiXmlReader& reader, xml::xmlelement element, Panel& panel) {
+    readUINode(element, panel);
+
+    if (element->has("padding")) {
+        panel.setPadding(readVec4(element->attr("padding").getText()));
+    }
+
+    if (element->has("margin")) {
+        panel.setMargin(readVec4(element->attr("margin").getText()));
+    }
+
+    if (element->has("size")) {
+        panel.setResizing(false);
+    }
+
+    for (auto& sub : element->getElements()) {
+        if (sub->isText())
+            continue;
+        panel.add(reader.readUINode(sub));
+    }
+}
+
+
+static std::wstring readAndProcessInnerText(xml::xmlelement element) {
+    std::wstring text = L"";
+    if (element->size() == 1) {
+        text = util::str2wstr_utf8(element->sub(0)->attr("#").getText()); 
+        if (text[0] == '@') {
+            text = langs::get(text.substr(1));
+        }
+    }
+    return text;
+}
+
+static std::shared_ptr<UINode> readLabel(UiXmlReader& reader, xml::xmlelement element) {
+    std::wstring text = readAndProcessInnerText(element);
+    auto label = std::make_shared<Label>(text);
+    readUINode(element, *label);
+    return label;
+}
+
+static std::shared_ptr<UINode> readContainer(UiXmlReader& reader, xml::xmlelement element) {
+    auto container = std::make_shared<Container>(glm::vec2(), glm::vec2());
+    _readContainer(reader, element, *container);
+    return container;
+}
+
+static std::shared_ptr<UINode> readButton(UiXmlReader& reader, xml::xmlelement element) {
+    std::wstring text = readAndProcessInnerText(element);
+    auto button = std::make_shared<Button>(text, glm::vec4(0.0f), nullptr);
+    _readPanel(reader, element, *button);
+
+    if (element->has("onclick")) {
+        runnable callback = scripting::create_runnable("<onclick>", element->attr("onclick").getText());
+        button->listenAction([callback](GUI*) {
+            callback();
+        });
+    }
+    return button;
+}
+
+static std::shared_ptr<UINode> readTextBox(UiXmlReader& reader, xml::xmlelement element) {
+    auto placeholder = util::str2wstr_utf8(element->attr("placeholder", "").getText());
+    auto text = readAndProcessInnerText(element);
+    auto textbox = std::make_shared<TextBox>(placeholder, glm::vec4(0.0f));
+    _readPanel(reader, element, *textbox);
+    textbox->setText(text);
+    return textbox;
+}
+
+UiXmlReader::UiXmlReader() {
+    add("label", readLabel);
+    add("button", readButton);
+    add("textbox", readTextBox);
+    add("container", readContainer);
+}
+
+void UiXmlReader::add(const std::string& tag, uinode_reader reader) {
+    readers[tag] = reader;
+}
+
+std::shared_ptr<UINode> UiXmlReader::readUINode(xml::xmlelement element) {
+    const std::string& tag = element->getTag();
+
+    auto found = readers.find(tag);
+    if (found == readers.end()) {
+        throw std::runtime_error("unsupported element '"+tag+"'");
+    }
+    return found->second(*this, element);
+}
+
+std::shared_ptr<UINode> UiXmlReader::readXML(
+    const std::string& filename,
+    const std::string& source
+) {
+    auto document = xml::parse(filename, source);
+    auto root = document->getRoot();
+    return readUINode(root);
+}
diff --git a/src/frontend/gui/gui_xml.h b/src/frontend/gui/gui_xml.h
new file mode 100644
index 00000000..e83252bc
--- /dev/null
+++ b/src/frontend/gui/gui_xml.h
@@ -0,0 +1,31 @@
+#ifndef FRONTEND_GUI_GUI_XML_H_
+#define FRONTEND_GUI_GUI_XML_H_
+
+#include <memory>
+#include <unordered_map>
+
+#include "GUI.h"
+#include "../../coders/xml.h"
+
+namespace gui {
+    class UiXmlReader;
+
+    using uinode_reader = std::function<std::shared_ptr<UINode>(UiXmlReader&, xml::xmlelement)>;
+
+    class UiXmlReader {
+        std::unordered_map<std::string, uinode_reader> readers;
+    public:
+        UiXmlReader();
+
+        void add(const std::string& tag, uinode_reader reader);
+        
+        std::shared_ptr<UINode> readUINode(xml::xmlelement element);
+
+        std::shared_ptr<UINode> readXML(
+            const std::string& filename,
+            const std::string& source
+        );
+    };
+}
+
+#endif // FRONTEND_GUI_GUI_XML_H_
diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp
index 5792e626..7707e965 100644
--- a/src/frontend/hud.cpp
+++ b/src/frontend/hud.cpp
@@ -123,7 +123,7 @@ std::shared_ptr<UINode> HudRenderer::createDebugPanel(Engine* engine) {
         });
         box->setOnEditStart([=](){
             Hitbox* hitbox = level->player->hitbox.get();
-            box->text(std::to_wstring(int(hitbox->position[ax])));
+            box->setText(std::to_wstring(int(hitbox->position[ax])));
         });
 
         sub->add(box);
diff --git a/src/frontend/menu.cpp b/src/frontend/menu.cpp
index 1f1e29c0..3838e23a 100644
--- a/src/frontend/menu.cpp
+++ b/src/frontend/menu.cpp
@@ -417,8 +417,8 @@ void create_new_world_panel(Engine* engine) {
         if (!nameInput->validate())
             return;
 
-        std::string name = util::wstr2str_utf8(nameInput->text());
-        uint64_t seed = str2seed(seedInput->text());
+        std::string name = util::wstr2str_utf8(nameInput->getText());
+        uint64_t seed = str2seed(seedInput->getText());
         std::cout << "world seed: " << seed << std::endl;
 
         EnginePaths* paths = engine->getPaths();

From 6ae59cd85174de9efbd067188abb46920350ce2b Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sun, 4 Feb 2024 06:03:31 +0300
Subject: [PATCH 7/7] worlds list is sorted now

---
 src/files/engine_paths.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/files/engine_paths.cpp b/src/files/engine_paths.cpp
index faea6438..10157ded 100644
--- a/src/files/engine_paths.cpp
+++ b/src/files/engine_paths.cpp
@@ -65,6 +65,11 @@ std::vector<fs::path> EnginePaths::scanForWorlds() {
         }
         folders.push_back(worldFolder);
     }
+    std::sort(folders.begin(), folders.end(), [](fs::path a, fs::path b) {
+        a = a/fs::u8path(WorldFiles::WORLD_FILE);
+        b = b/fs::u8path(WorldFiles::WORLD_FILE);
+        return fs::last_write_time(a) > fs::last_write_time(b);
+    });
     return folders;
 }