From 5b68a6c7ba4857cb1e0eba73d6b8d4aceaae5df5 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Mon, 17 Mar 2025 11:23:34 +0700 Subject: [PATCH 1/2] Add "quick move" to/from storage graphics --- .../mc/otm/client/render/WidgetLocation.kt | 2 +- .../mc/otm/client/render/Widgets18.kt | 8 +++++++- .../textures/gui/widgets/storage_controls.png | Bin 1071 -> 1371 bytes .../textures/gui/widgets/storage_controls.xcf | Bin 11478 -> 15956 bytes 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/WidgetLocation.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/WidgetLocation.kt index 76ca2623a..bbd38299b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/WidgetLocation.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/WidgetLocation.kt @@ -5,7 +5,7 @@ import ru.dbotthepony.mc.otm.client.render.sprites.MatteryAtlas import ru.dbotthepony.mc.otm.core.ResourceLocation object WidgetLocation { - val STORAGE_CONTROLS = MatteryAtlas(ResourceLocation(OverdriveThatMatters.MOD_ID, "textures/gui/widgets/storage_controls.png"), 90f, 72f) + val STORAGE_CONTROLS = MatteryAtlas(ResourceLocation(OverdriveThatMatters.MOD_ID, "textures/gui/widgets/storage_controls.png"), 90f, 90f) val WIDGET_18 = MatteryAtlas(ResourceLocation(OverdriveThatMatters.MOD_ID, "textures/gui/widgets/widget_18.png"), 72f, 72f) val WIDGET_15 = MatteryAtlas(ResourceLocation(OverdriveThatMatters.MOD_ID, "textures/gui/widgets/widget_15.png"), 60f, 60f) val WIDGET_8 = MatteryAtlas(ResourceLocation(OverdriveThatMatters.MOD_ID, "textures/gui/widgets/widget_8.png"), 64f, 32f) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets18.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets18.kt index 06bab6193..21aa5a69c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets18.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets18.kt @@ -6,7 +6,7 @@ import ru.dbotthepony.mc.otm.core.immutableMap import ru.dbotthepony.mc.otm.core.math.RelativeSide object Widgets18 { - private val storageGrid = WidgetLocation.STORAGE_CONTROLS.grid(rows = 4, columns = 5) + private val storageGrid = WidgetLocation.STORAGE_CONTROLS.grid(rows = 5, columns = 5) val SORT_DESCENDING = storageGrid.next() val SORT_ASCENDING = storageGrid.next() @@ -24,6 +24,12 @@ object Widgets18 { val PLAY = storageGrid.next() val STOP = storageGrid.next() val SORT_NOW = storageGrid.next() + val MOVE_EVERYTHING_TO_STORAGE = storageGrid.next() + val MOVE_EVERYTHING_FROM_STORAGE = storageGrid.next() + val RESTOCK_TO_STORAGE = storageGrid.next() + val RESTOCK_FROM_STORAGE = storageGrid.next() + val RESTOCK_WITH_MOVE_TO_STORAGE = storageGrid.next() + val RESTOCK_WITH_MOVE_FROM_STORAGE = storageGrid.next() private val miscGrid = WidgetLocation.WIDGET_18.grid(4, 4) diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/storage_controls.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/storage_controls.png index 0c33af3f2bb17a5f806efa7c82d70f66f9efde76..054f10becee5be6977e92b4c905e07d6cb286bcb 100644 GIT binary patch delta 1312 zcmV+*1>gFw2-^yf7YbSk1^@s6IH*Aaks%x&P!xqvQ>7x6B6bjU$WWc^q9Tr^ibb$c z+6t{Yn7ol&Ab#<}FMz%#=}Ha$-qCKgLwEO#+08!GV(aYRuy%6}JfE-Re3IIGn zxk5(IQ7cXdAe=?r8EJaJd5v zKk1SoIe(I$N+=eA_cQvYJTP<%^sl*dYoFuv0m#yTS z5r3&%o*JJMG5hgUdz5h;Tiok&Bj&sHV)juj4u%I}h%{X!DSo1cAXsyBr z1q%QG00000&_GL5O?D4@Se58d%^$lJL0UaV9CewbF4^lsS^*MAHE005x!8dJLTPCa*tx;VXFub_&#Uaz)y zsv{i7QqRJWJ}cwz@1N$^j}K#vF`wUm%;o;hmYz9hp*j9IiIb^H?`TZw^CMjDZ}VmT zU(7{O-%H8n_~WF`#vDt{fSgmM8WF8|s#H?^styrrQaXO+~b!j3_NA%Gy9+zxHG_%7Jde8|Xng&*fMf%_QdU*#~ zRxwAH>_oKaqIXMlsYOh>s3M}d`AYa7eGt*a>QbYmKZU%LMla<($TB5ahE4;4=AO2K4+Pb7{q-LQx^i03vfo%23%h?OOU_?&pkpbHW| za$R=$jdRIifoFz{Y&uRHA{I+sEO#+08!GWEaad6`%6}JfE-Re3IIGniARSlF3y8BgX=2P$4;f@IUz7TeCPb z?Is0dK<|rfe@p;@U7*#l?eAmTZk+)BXW&Zf_-jpI{*&}ZM++YTL)*Z`bw`u;fXf|V zwQCxAr+sAAl_NYWW5@I0Pn3l)dip?!NB6{ae%S z-w$G{}w{XfO3AvD5g{&M&U0 zcYph2j!`Lz=vuT}R++?JB^}Z%qxbSV`qvV4wpzN6S+jJcgOM&lsiv0nRYOwA&O)+< zr?{F-Xr#hIoW!R^I>ZGF#ffainWbabZ4J?0g%1S_000000JtERmZY@N{ldVf#ir!}Z*h*Gk=$(OVz^ET!gS(-j{&5x!* zbW4pcHTktfX#BLE)UX*kr*)bS&~-Ds6Nx4HJKB_1LmV;Sv*Ud)4Ln{s@bDu&Wx3?4 z!c!|i>F*H=eK%`!dIxm+O$iPF004OBk5~Cw6`M4b@gk|Ux83^TuKM7chLEeto_`@9 zb|w0(<}dvf!CFbJOt$65|E4J|JsUx*S9&fH{rCDQWczQ1chKTl#=6~QX)c}KdC9{H zWcQY`ZS@JPGRDoC$ZJj<{!QfSig8pR47=AcV`N*$WU-5PuKs5F@XH)!S^q7&;+_Ej z002A-UMCvBSb{_LAfh3AAkmOLfIDa^tAP;>*^NYN@a9nP}u-U_?Xq gKn+a diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/storage_controls.xcf b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/storage_controls.xcf index 894ea7b4b51d74b4b16bcdc5200851e7e5f64c4b..3dbdd5d0e433eb90145f6929a9148a7ce041b823 100644 GIT binary patch literal 15956 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 W^S>(jxWhtg85{QL);jF$RR0Clymbly delta 676 zcmcaob1ia$sFVi-1WW@`fDtX@(#lLsJgRWrJdR-9JdvBv%f>M?@$ZDo z@LvUM=YI>cJVvQ*^9w~UCMKbMFhz_)lP?O2GYNg#oT0LliAi)VOoB=DBuF=t=)=w7 z>a&=bBx>O@5;K8JamJ0C)wQ-WF-d2^C8XOxS~#WW!7Pl|%blE{mjl9^6ZDc8ndJQ7 ziseB1#F*roHviCMiqGdR&QbTgkN2NRR#BDf+=P}qnuX Date: Mon, 17 Mar 2025 22:28:02 +0700 Subject: [PATCH 2/2] Rearrange icons in quickmove --- .../textures/gui/widgets/storage_controls.png | Bin 1371 -> 1303 bytes .../textures/gui/widgets/storage_controls.xcf | Bin 15956 -> 16168 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/storage_controls.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/storage_controls.png index 054f10becee5be6977e92b4c905e07d6cb286bcb..d46201f5e4b8bb78105dec2c9e8c3a39eb5432a1 100644 GIT binary patch delta 847 zcmV-V1F-zt3YQA7x&aCQ0RI60puMM)lfwZae-9fayY%uP0009NNkl(>{z+s$g23{CA_WQ7od zf3?=G2Nb)`5wo;e%iVqE1tM~`JlDQNW47(7@+j>%vbf{(Big%VFk7vpXmn27C9{mu zo@F|yUPkTdx0TN&C^lQF_n9+wsGXrsL8?tn*;fupsdf^QB|Q1j%ml|&NQk4zl$Z{3 zz=Gg}Hsi#mW3k&DqO}4a1S|jm00000e?S9Yn&QsFy@MY;8PO#bj*<$AH1AwXPS+Z} zgx2eP0EhTgvOh&!>VFhDrAn29r;?>jJ|#W5PGiQ%;^d)oaySX1L)z$6lAlWiM^0&_ z28*GxTgQ0;RTsk}k(e@n+cv4$;P>coth}#f1GifaG~`gLEKRm5%o+hwfA^qJe|NDK zyLSN3ej@}200000ZU3>AoKfMZu8bB*rMd0W7uV{AI}RbO$?m})RwX(X^QVp?NF%9{ z$(HQ+cbw2tGZ8d;q^F|M54WF!Z2iUX2)4MFzPh7K&7s{pE%Pt}*|klX8+`zy^wCKj zc}~UQ(Lh>9jC(1fV)NE;=ehnEa_?45!Va=007`1$oa=q|5-~; zE&sjv3`HW)moBvLnCY9s2=Aee{g+@m-x(3=pi{(F=hTWlqZ|ML0AK*rszl6|E7|=F%UaeCl++tt%lz60Py!D1`SwIU5_@TSa4ZJlwY1TmJX3ME92eg+@c8q0vLScR&T85&-}} Z8h?d1Z`G{4zsmps002ovPDHLkV1gfOq=*0j delta 915 zcmV;E18n@43fl^>x&a9Q00000`9r&ZlfwZae*_UG)JLT8000A6Nkli%y&tj@``fc%>Df8Ifu_w8wo-Q8_Qmu0v>GWxGkRBB zf8KjTS5vg3B8lMv}`|(tJlyMwe-0O2A=DYP`_EAZR=v1^z zW*KEXD|Jv+M(OFdx6dUgG+T=M%$Yh=XQ)$l|xc&oP=ZvPj0j{!ATVo;wUyH zse@dwpg5t;IC1J&^EQWQt-=Qd3jhEBe*gdg&_GL5h z9nouPz1`=QbO^zy@wF0ERfA2t{ z?qV&LcK|PcqXY*40001O{n*ORs92~{MvJ7}z3to|uGJ5|a0qElb`N@3mFQ5-AG;Mn zT1kyew&cYB!YM5^H-bj5^i(4H@c1dn)?W-~$i=<*y38^)hn9C*>0t!2OQ*7B^a~ip z$3-gSIUR?i3u#?3)(V7b=Q?_fe{88wl5uY4>aV9CewbF4^lsS^*9-sv0HE?3Q@Zp{ zJ$H$^IK5u4po+O(ueOAL+Wt7IBOJ$4&%%&CE939)pXS$(4`YlmpWlDX<^Il=o;hcs zIsQ0_lc`GYXiVz!BV6up^JV^D%tcY(OUdT=mpVpqP1?kDH%bd`r|^XqKAl%-NPL#d^jnjMB$VAe)a*HYMU^LlTsy5Qfc_t zy$njpOz!8UW#ZY7BLe^cearyzCVs6>#H?^styrrQaXO+~bs|nj^wBOJmuy5dv%?a4 z&XR=s`HWbbAQ$$$SigOo|9Crn#IQ%PuOo?BPGmf4=!<=J(CK>ABr| zgP%$wZ~MWP6=AOQ#IDTRGM&86VBoowlTvtV?H!x4>L9l%!{V`4CY77b}?rA zRWIpt=NuXy9UbPK2Exp6bkcS@U5FdD!2khQH&+oYJ~t~urN7KQWm}9{bIE5V64oF2 zoX+{=8)Iy2_I!oa)0+|zJoEpPl#>^p#aZ_} zCWvvGD$1}qPp0wwlUZ_hXktAA*@CQRCex%`<-DMZ^+-SqaX#A|)W09l-1zgQXE|TS zZ&fhv%fom`S3%&dtb)KeZ3y%MWS!AY)^%9}S%aw>h@uQxbsU_{|EUrb%Gr+^T;0sY z@05!V^ho03j?R_#-(e@k6`js(*|xZLs`#DEiPB=$boopY5;8l$vcwfQ^+8j$nfYU+FA4%Fw;hfDUFgE+EUyPQ1(hY zWgnzd?xMwIj{qv4Xs2>SINr)nsf=w^M@W0sVe!%Ss(l!$Z|K3*A}$QoZ|JvJKH!hq zsPV~JY9gswZm#)3x72LMV4c*1tZOpbx<_Bv9>7o^)J}bsbm}+LgLOf`ak8T>SH7q5 uZee)ims9h0#COrmxEJsj9o!&JCJYTFbnE&_42?zFX>68G<8IQE82JgvESy3B delta 1412 zcmds!O=uHA6vy|yeAqN!jg3vSX-v{an>L9FZIZS&$w`nZXv9JV5fu*#77@LcdQd9Z zOLaU|5b=Z7iWZy%tvJX|PIdtVne}m)dksYV(*>UqY&XPHNi&so|K^4x_#|D9^DkQsW<` z?pu%_wX)?QL^}y)g$9zkWhRh>AXK zyQWA(2tv$f>3}#tX-NT$urnqVtykH*WD8m+dD%LPkRfO*)uG*XK}MqJHxSmXZtz6og|BQhAiGP zpWHQS!qz0w)*+&;XL-_p4pG&Js-KCfHLe9_5QC412FrD73oaW0^P{1|z)GPfd^&s{ zFw#e^$Z>K-E*dVD?il9_?S~Mfc``&#(D3MGp5HT%5GUAqkYML&9*<2UcC8WZ_7Uw) z@wM(3h>0rEq*@L z7rxFG*h032uV)(pbH%y|a_rcE*P=UeS9q~+Cu08uHTOTH=KlGO=1&7pd2at4K$z-- Zd3xpGFc0TzfQ1s#!YI+g4OS|yd