From f3a92344405fd96f6bbbb7cb4cd234f120994917 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Tue, 21 Jun 2022 23:10:38 +0700 Subject: [PATCH] Split widget file --- .../mc/otm/client/render/SkinElement.kt | 7 +------ .../client/screen/panels/ScrollBarPanel.kt | 10 +++++++++- .../textures/gui/scroll.png | Bin 0 -> 697 bytes .../textures/gui/scroll.xcf | 3 +++ .../textures/gui/widgets.png | Bin 2798 -> 3190 bytes .../textures/gui/widgets.xcf | 4 ++-- .../textures/gui/widgets_18.png | Bin 0 -> 1179 bytes .../textures/gui/widgets_18.xcf | 3 +++ .../textures/gui/widgets_8.png | Bin 0 -> 727 bytes .../textures/gui/widgets_8.xcf | 3 +++ 10 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/scroll.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/scroll.xcf create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/widgets_18.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/widgets_18.xcf create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/widgets_8.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/widgets_8.xcf diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/SkinElement.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/SkinElement.kt index f8b1ff624..feb1cc6ce 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/SkinElement.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/SkinElement.kt @@ -230,12 +230,7 @@ val left_window_border = SkinElement(RenderHelper.WIDGETS, x = 18f, y = 4f, w = val right_window_border = SkinElement(RenderHelper.WIDGETS, x = 27f, y = 3f, w = 3f, h = 5f) val top_window_border = SkinElement(RenderHelper.WIDGETS, x = 22f, y = 0f, w = 5f, h = 3f) val window_background = SkinElement(RenderHelper.WIDGETS, x = 30f, y = 12f, w = 6f, h = 6f) -val scroll_bar_top = SkinElement(RenderHelper.WIDGETS, x = 18f, y = 57f, w = 14f, h = 2f) -val scroll_bar_bottom = SkinElement(RenderHelper.WIDGETS, x = 18f, y = 63f, w = 14f, h = 2f) -val scroll_bar_body = SkinElement(RenderHelper.WIDGETS, x = 18f, y = 58f, w = 14f, h = 6f) -val scroll_bar_button = SkinElement(RenderHelper.WIDGETS, x = 18f, y = 12f, w = 12f, h = 15f) -val scroll_bar_button_hover = SkinElement(RenderHelper.WIDGETS, x = 18f, y = 27f, w = 12f, h = 15f) -val scroll_bar_button_press = SkinElement(RenderHelper.WIDGETS, x = 18f, y = 42f, w = 12f, h = 15f) + val tab_right_connection = SkinElement(RenderHelper.WIDGETS, x = 30f, y = 0f, w = 3f, h = 5f) val tab_left_connection = SkinElement(RenderHelper.WIDGETS, x = 33f, y = 0f, w = 3f, h = 5f) val tab_background = SkinElement(RenderHelper.WIDGETS, x = 30f, y = 6f, w = 6f, h = 6f) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarPanel.kt index 2a6298a66..41416d91b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarPanel.kt @@ -139,5 +139,13 @@ open class ScrollBarPanel(screen: MatteryScreen<*>, parent: EditablePanel?, x: F companion object { const val WIDTH = 14f + + val scroll_bar_top = RenderHelper.SCROLL.element(0f, 45f, 14f, 2f, 14f, 53f) + val scroll_bar_body = RenderHelper.SCROLL.element(0f, 46f, 14f, 6f, 14f, 53f) + val scroll_bar_bottom = RenderHelper.SCROLL.element(0f, 51f, 14f, 2f, 14f, 53f) + + val scroll_bar_button = RenderHelper.SCROLL.element(0f, 0f, 12f, 15f, 14f, 53f) + val scroll_bar_button_hover = RenderHelper.SCROLL.element(0f, 15f, 12f, 15f, 14f, 53f) + val scroll_bar_button_press = RenderHelper.SCROLL.element(0f, 30f, 12f, 15f, 14f, 53f) } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/scroll.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/scroll.png new file mode 100644 index 0000000000000000000000000000000000000000..619aabceb025591c572c4d5fd0ff5c1d8a01dc4f GIT binary patch literal 697 zcmV;q0!ICbP)EX>4Tx04R}tkv&MmKpe$i(`rR34i*t{2w0sgh>AE$6^me@v=v%)FuC+YXws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;qmz@Oi*kx9)Fhl#~v8_R9XN`^{2MI2F7jq-)8 z%L?Z$&T6^Jn)l={4CS@uG}mbkA&x~Pkc0>sRcxRP3sG7%QcR?1Kjz^dbo@zj$>iDq zBgZ@{P$4;f@IUz7ty!3yaFaqYpyS21KSqGyF3_mi_V=-EH%pV2qvfWBLxd)4i&xsTHaAVXa(-2exN zz-W=O*F4_c)!y5`XPW)}0BE;zqZ7|y{D4^000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2j&J94zKkWyar5Swm?k69BwG^I&`Fnlt`G^;7D$Azd{_J#~u1iYn{;{?>z$m4gljgHkm>Q z?=`P&)>K~3zZK3zL?Zq`JfqdbQc7L15<+}p6=Q5NNh$X|uIqYen&-JboU+jT9YiGJ zJ?VJhqBsC7%hGh%Ik)d|+qOf~FbwtKl!fN+AR-a(i4~isDfdQ7DfN1)QmV^njJY1< fe=x#Yo3H2z2`!l1=?^yE00000NkvXXu0mjf&b~Na literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/scroll.xcf b/src/main/resources/assets/overdrive_that_matters/textures/gui/scroll.xcf new file mode 100644 index 000000000..d22f2d408 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/textures/gui/scroll.xcf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e616c18b1a07c8d4147d351c51a0f50f51ba67c38acc6f88f3f286a7465a9a3d +size 2426 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets.png index 86ed9c540ccca465dcd9e2b9c03913094c5a0346..18d0611f3999f5c498a754170d8f9eecda269b95 100644 GIT binary patch literal 3190 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 Wt-?OvLq*3D04@$5_NBJ$bN>P{b-wxl diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets.xcf b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets.xcf index 515415ca1..2c1e1ad14 100644 --- a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets.xcf +++ b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets.xcf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:289e6665dcc783a0b712a41470d3ae4a41e65a0e2b8c643f995415258cecdce8 -size 29982 +oid sha256:38fa3dd76b920593331a25e47779cee7a1d3716b57881c3082c7e9f85f16482c +size 45416 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets_18.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets_18.png new file mode 100644 index 0000000000000000000000000000000000000000..faa5401c5ac3df2c311d01b1fb0340edba02848f GIT binary patch literal 1179 zcmeAS@N?(olHy`uVBq!ia0y~yU{nBM4mJh`29f4<4M0w7rn7T^r?ay{K~a8MW=<*t zgT}<#iMAex9b}HiU(RyX;u8}rzrAow0A<|^B=p~``4ET&U;$>?)=5YPkh;axIBtnCN1{S>f@JX zON;NR^KG8AL}0#fzhsHyBlmTu_4XI)S?PQ@vtgp=S;6+sqe;@IbI*9SdD*zi1cvl} zYF%@h>$&c^tevN3eSf0Q^K|P|lk1s$ihZss6IwVVLvt4Ja0f=22Kg+>uz&VYzT}T* z(a9&b7?h9OXay)*)_t)5ad&Oxj5!69oeUQ|KDy1`t>J;*g%vlyeczaC?#J-oxM1nl zKU1v?K6_TJUFzD`a4+}4qg_i+Rv&oEXYgT(ciR(>x>-&O8TQP-X#TWeU-W|Nt8drt z?7z&e;2f)amw~{XE)7O>#8Jj4-fF!Z|^vE z9WoGMdvHDR-9ybIzS|$oJeq6vNYlnMUG>PNEZ@b!Uw=DfEaVNWwAbIdwX;J{>%}gu z!y%VVe1#7z`s?PBV>UaoS*HJZN5_r4?VFET%J5D9@MDDmOCC#r%aN?DT2c>c?Bd_P zFWbGS@Z0adSN~P*)suQ&V)ZlZq3@rX*V6u)rJAa1g>)7&H`&bj{C8V!tiLmZ?plY> zhh$zYTPBw0wQ{%2?ELGqZZCfR{rp^ObpZ#_!|572ZC%%vvogKVd|1pm*HYG5F39<| zYV2`iE780BOc{x%*Sk+M_|CQanGnytlh^-nnWcJ~Je{#EclMu9DZ2yHOC7c|CA~A9 zJ?TT`F(IB32kt5Qg~yr_@(#wo)16h-A9&BTH+TBEhga_^zi3bssoC!!&pCf#^07Kr zW|j*X9Cx{={eN*T>&(()Kl5B%81`zkh=l(YU}ju$;z2FbivJc}*5j~)%+dJES*}`qVuFPn5p#7qx-7gzyAu{}5sfM}*!jgd)7^x65h=SJMObj>VHFFY2E1WB-y1O2?WX*X`N;eMdDr$5*4^vj;2|WKEmcb^J(9 zo-5D3MZ$?J20eA1Gpm&LPH24oV^@3s`trbePixGPxN`7ZhdNUJ(Ewd&sAkY3x{NA&H^6pz$nuopCuXg&mPK`{P8S0 z`Q#RZ@^Krj07c8X5B5Lqu8o{Ar(m*^;ey9Ux7oWjJkYza;^w#S8*|P582%d&Aq!<@7>;?KI`vahK%h+i-phU+5qE)Ey>&6h2cL4F4((# zGEjuGz$3Dlfq`2Xgc%uT&5-~KvX^-Jy0SlG6XjPhiB_5p61wc^;uunK>+MxXz9s_! z)_`Lb%j1@~HwG8HC`@(YX-x{@sm!RPbTx1E0ya^7{#+1_IADh$<(){$LvRI<-Fo_oo4=P Q&q9z9p00i_>zopr0G#b8@&Et; literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets_8.xcf b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets_8.xcf new file mode 100644 index 000000000..42b5542d6 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets_8.xcf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7b8699adea98971280f5a2d155b33fbf59684188b14ed86944b3fbba592c89f +size 2220