From 6f206bf02e38b991df5762b864509d3bd4c741b8 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Fri, 7 Oct 2022 13:18:35 +0700 Subject: [PATCH] Scrollbar textures split --- .../screen/panels/ScrollBarConstants.kt | 19 ++++++++++-------- .../textures/gui/scroll.png | Bin 779 -> 0 bytes .../textures/gui/scroll.xcf | Bin 5687 -> 0 bytes .../gui/widgets/scrollbar/background.png | Bin 0 -> 150 bytes .../gui/widgets/scrollbar/disabled.png | Bin 0 -> 150 bytes .../gui/widgets/scrollbar/hovered.png | Bin 0 -> 154 bytes .../textures/gui/widgets/scrollbar/idle.png | Bin 0 -> 161 bytes .../gui/widgets/scrollbar/pressed.png | Bin 0 -> 154 bytes .../gui/widgets/scrollbar_slim/background.png | Bin 0 -> 149 bytes .../gui/widgets/scrollbar_slim/disabled.png | Bin 0 -> 147 bytes .../gui/widgets/scrollbar_slim/hovered.png | Bin 0 -> 150 bytes .../gui/widgets/scrollbar_slim/idle.png | Bin 0 -> 156 bytes .../gui/widgets/scrollbar_slim/pressed.png | Bin 0 -> 150 bytes 13 files changed, 11 insertions(+), 8 deletions(-) delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/scroll.png delete 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/scrollbar/background.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar/disabled.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar/hovered.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar/idle.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar/pressed.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar_slim/background.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar_slim/disabled.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar_slim/hovered.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar_slim/idle.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar_slim/pressed.png diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarConstants.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarConstants.kt index 6ce6de1b0..764a624df 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarConstants.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarConstants.kt @@ -1,5 +1,8 @@ package ru.dbotthepony.mc.otm.client.screen.panels +import net.minecraft.resources.ResourceLocation +import ru.dbotthepony.mc.otm.OverdriveThatMatters +import ru.dbotthepony.mc.otm.client.render.AtlasSkinElement import ru.dbotthepony.mc.otm.client.render.WidgetLocation import ru.dbotthepony.mc.otm.client.render.element @@ -13,17 +16,17 @@ object ScrollBarConstants { val BODY = WidgetLocation.SCROLL.element(0f, 46f, 14f, 6f, TEXTURE_WIDTH, TEXTURE_HEIGHT) val BOTTOM = WidgetLocation.SCROLL.element(0f, 51f, 14f, 2f, TEXTURE_WIDTH, TEXTURE_HEIGHT) - val BUTTON = WidgetLocation.SCROLL.element(0f, 0f, 12f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT) - val BUTTON_HOVER = WidgetLocation.SCROLL.element(0f, 15f, 12f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT) - val BUTTON_PRESS = WidgetLocation.SCROLL.element(0f, 30f, 12f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT) - val BUTTON_DISABLED = WidgetLocation.SCROLL.element(0f, 53f, 12f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT) + val BUTTON = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "widgets/scrollbar/idle")) + val BUTTON_HOVER = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "widgets/scrollbar/hovered")) + val BUTTON_PRESS = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "widgets/scrollbar/pressed")) + val BUTTON_DISABLED = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "widgets/scrollbar/disabled")) val SLIM_TOP = WidgetLocation.SCROLL.element(14f, 45f, 8f, 2f, TEXTURE_WIDTH, TEXTURE_HEIGHT) val SLIM_BODY = WidgetLocation.SCROLL.element(14f, 46f, 8f, 6f, TEXTURE_WIDTH, TEXTURE_HEIGHT) val SLIM_BOTTOM = WidgetLocation.SCROLL.element(14f, 51f, 8f, 2f, TEXTURE_WIDTH, TEXTURE_HEIGHT) - val SLIM_BUTTON = WidgetLocation.SCROLL.element(14f, 0f, 6f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT) - val SLIM_BUTTON_HOVER = WidgetLocation.SCROLL.element(14f, 15f, 6f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT) - val SLIM_BUTTON_PRESS = WidgetLocation.SCROLL.element(14f, 30f, 6f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT) - val SLIM_BUTTON_DISABLED = WidgetLocation.SCROLL.element(14f, 53f, 6f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT) + val SLIM_BUTTON = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "widgets/scrollbar_slim/idle")) + val SLIM_BUTTON_HOVER = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "widgets/scrollbar_slim/hovered")) + val SLIM_BUTTON_PRESS = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "widgets/scrollbar_slim/pressed")) + val SLIM_BUTTON_DISABLED = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "widgets/scrollbar_slim/disabled")) } 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 deleted file mode 100644 index a5c44ed983d58adfdf7e09498a8480011c370b01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 779 zcmV+m1N8ifP)EX>4Tx04R}tkv&MmKpe$iTT81{9PA*{AwzYtAS$ApRIvyaN?V~-2a`*`ph-iL z;^HW{799LotU9+0Yt2!bCVj!sUBE>hzEl0u6Z503ls?%w0>9pG(NnPT*e1BzFVPW-reS>)G@?ahO;rb+OdNtgI` zb6DoQ#aXG=S^J*+g`tAFlHoed2ohLA5-A9fP)7w-n26D;l42lD`*9cluy{D4^000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2j&SJ1vnb_AYTIj009R{L_t(o!|jy84TK;RM28Ir z+tG`OwqYmI1= z_HNGhxmirpbUUPl8d_D=Y47H2pROAb6EP9Tyf9n4y^u*90Q$anN=zq8vXZqD|pHi?*si8z`#L>pU5w%&3RrcE|1!jPbhcd(; zh?8Y{Pqs2WUM^=R`NOOE$r&qo$RHVil$U%3KxrYJW(r^>P1a4#|yfp?jDRa z3*^6Lb%N`b?D=WQ-l!!b?=2ZCTC#7+l8Hx_?Eh@Z^dC#^Y9;C=h!Mjfc86`Uw`{$+ zqOg0-W%ioAX$DofbQcD>k=9!4tI_$><{fMAriNnNr9`m2FbrQal&h)>a}?;AbLC+z{sG8k^9X>w%J@Fq-?TR2!+@1fi=0s#~>cwq0pxt zy%P}|AE6%(J~D;c+#WL8x)E%&G^3&G4b8pU*7T6(<=Os?n7eG1J*RrI*1X9!5FD=| z2GzwaVupCOEh&lhmj8xq#DotEW4RBn&T+fc3O4+$Ex@JaUX@y2o5#cl>Ngk_B_&pr zhg3;STww19c?};~T9aFRbaHEcGhYNd7AGDN8y}G~+(DB2NR6E5c4@S&kM`(oW8X%X zjDs6AhK&GQE>BySb#mpU93ed2~b#UPgcYUJ?avAaQGw*T(BY-kPMN&o;3Jd#nA@pbR;ldb zAV+1_t!kECw+{=iKe&0!vWp`%KkUbtX90m+bOQ(^U7+|?p~FL910w#w!AGXJ{l6AL zqZOe<8r876O^E1Dms?(*?TT*=1%yWkdvn4BiDwUN$Xz!FHrz4@lzb+1co=M;BtJU% z$dvrf?UY(Nuo;c8zD*~#?sO9bHZBOzF-X zvPzXiwW^BRr7o*pp3MO)3FhgG1D-p#=aC?vz>*oUzXvFpqrzD3BU5IS+oQNRh%~n8 U;sAw3>r$udgQ)hu%n9iH1pzp(k^lez diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar/background.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar/background.png new file mode 100644 index 0000000000000000000000000000000000000000..16a6d03eb4b6e88ce423e677bd62fbf660bcd8ad GIT binary patch literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^d_c^>!2~4TiX&$ODaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheoCO|{#XwDmL74G){)!Z!pth%rV~9p@vWdBQx&l*6OUnia4GwvJ4Nc9& pCZkRUXHQM%^78NXNeBM_XLx!jjSt9Gc&TWG4vKO?dlTRkP1}9;OXk;vd$@?2>?X&BZ>e3 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar/hovered.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar/hovered.png new file mode 100644 index 0000000000000000000000000000000000000000..2c1f8a772e2b548006b1be2dae7e00b9f76cdf97 GIT binary patch literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CP!VDyp&Kp+&DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheoB=)|u0MYKICkt4E2jVe literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar/idle.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar/idle.png new file mode 100644 index 0000000000000000000000000000000000000000..d0b74649fd43b5e661958add739f26d677938939 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CP!VDyp&Kp+&DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheJOMr-uK)l4@9yqCcI;S5Nr~!NWe%V?XMsm#F#`kNVGw3Kp1&dmC@AOY y;us=vIhldkjZIBeAs{V5h=nQj)u)zT5MZoa#^IXpl6DrTlEKr}&t;ucLK6Ubek`&8 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar/pressed.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar/pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..288b7262ee700a4340f5bd45641a6a8f0622f227 GIT binary patch literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CP!VDyp&Kp+&DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheoB=)|u0MYK$j;8Tva+iG8|w)YEbxddW?!lvI6;>1s;*b3=DjSL74G){)!Z!pq8hLV~9j}vWdBQ`T+(-MMWI}u0!q3lO_qN pX$Ui4aBf<-d-rd9wIBcG8MYsmn#w2pCJv~J!PC{xWt~$(69AgjCx!q3 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar_slim/disabled.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar_slim/disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..32aa4cf05cc2f6e1354624a1b5d75d9123303f5f GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJvjzBsxLR3RWoKvSWO2_1if|TqL>4nJ@ErzW#^d=bQha|ZZ?xc>O@anMprDwii(`ny puc)I$ztaD0e0szi~Cl&wz literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar_slim/idle.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar_slim/idle.png new file mode 100644 index 0000000000000000000000000000000000000000..11663c093598a50673ada5684b17257da3ab0bcd GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ^91;Wxc>kDzq`Bp*s)_JB_*n7l{tXooCO|{#S9F5he4R}c>anMprE9u wi(`ny<>Z8fgp`D!ptJ;`5VcM*Gcz`Z_zTP%*2HSh1S(?iboFyt=akR{01)3RS^xk5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar_slim/pressed.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar_slim/pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..805e39d957eeeab83d84dbaebd2a9ca72c8cca45 GIT binary patch literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJa|ZZ?xc>O@BRf0W%F3$#Z>%Rsu)rg-n1O-sFbFdq&tH)O6cqDxaSV~T ooXo)J=E%tArph=egN==i!QPTdvEub#7N80SPgg&ebxsLQ07)4oPyhe` literal 0 HcmV?d00001