From 0b64ffafaaf9b4ea2b5af8d9bca448b5bafd0380 Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Mon, 13 Mar 2023 10:28:31 +0700
Subject: [PATCH] Add MtU and complexity sorting buttons

---
 .../mc/otm/client/render/Widgets18.kt         |   2 ++
 .../client/screen/matter/MatterPanelScreen.kt |   3 +++
 .../textures/gui/widgets/storage_controls.png | Bin 803 -> 847 bytes
 .../textures/gui/widgets/storage_controls.xcf | Bin 4408 -> 5791 bytes
 4 files changed, 5 insertions(+)

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 09c145a92..75194029f 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
@@ -42,6 +42,8 @@ object Widgets18 {
 	val SORT_COUNT = storageGrid.next()
 	val SORT_MODID = storageGrid.next()
 	val SORT_ID = storageGrid.next()
+	val SORT_MATTER_VALUE = storageGrid.next()
+	val SORT_MATTER_COMPLEXITY = storageGrid.next()
 
 	private val miscGrid = WidgetLocation.MISC_18.grid(4, 4)
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/matter/MatterPanelScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/matter/MatterPanelScreen.kt
index b0d37957b..9f16c5b60 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/matter/MatterPanelScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/matter/MatterPanelScreen.kt
@@ -67,6 +67,9 @@ class MatterPanelScreen(
 			it.add(ItemSorter.NAME, skinElement = Widgets18.SORT_ALPHABET, tooltip = ItemSorter.NAME.title)
 			it.add(ItemSorter.ID, skinElement = Widgets18.SORT_ID, tooltip = ItemSorter.ID.title)
 			it.add(ItemSorter.MOD, skinElement = Widgets18.SORT_MODID, tooltip = ItemSorter.MOD.title)
+			it.add(ItemSorter.MATTER_VALUE, skinElement = Widgets18.SORT_MATTER_VALUE, tooltip = ItemSorter.MATTER_VALUE.title)
+			it.add(ItemSorter.MATTER_COMPLEXITY, skinElement = Widgets18.SORT_MATTER_COMPLEXITY, tooltip = ItemSorter.MATTER_COMPLEXITY.title)
+			it.finish()
 		}
 
 		val scrollBar = DiscreteScrollBarPanel(this, frame, {
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 9905a78ace4c217229c6ee8f66bd03428dea1164..5955c8eff8e2a38ed3a539a9918b665f847bfee1 100644
GIT binary patch
delta 761
zcmV<V0tWq~2G0hNJ%3OXg-=tZA}t;4AR?HdI$01Eag-_+!9r;(wCZ5;(m!a@kfgXc
z3a$kQe-^6_F3!3-xC(;c4~VOalcI~1cwbUz5#xi)`#A5N!+rMwLbJ+Lvu6TOHOojR
z;$kkpDh6KRM~Etn5s8_4GP9V4=lZ&bkMDOep5=Y-&lOS%CVvBbBJmv44U2e#cxKbm
zIqwrkSXokt&xywkYLNJm>$1yloJ$T1JTqcs)APg;VzJc4au>6*p%PCMM-^40d?Dwu
z!g-6cTCKBopZtZvg0_<3I@K@|SV9shh>%f71yxvx(XNqVB2DLU5C4$kPmxO|R|Sk5
z3#dVb<oLn=;D7gQ&EnLgn-q)#y)U-?F$x5BfmXw|zmILZbprUGfh(=!uQh?$PtqG5
zEqVlmw}Ff6jwbH`mpj1VlP(#OBl)R>Vi9;hqi@Os1Ghl`nmf1lIZhvdEX`{91~@nb
z#!8gE?(y!v?z#PYr#-(PG!k--GDy7v00006VoOIv0F$}_DSr(E7aRZo(6j&m0Zd6m
zK~!ko?V4c@!ypKS+os3j_}r`eWnzdLKyY?@U$UfGEXWhc)Ex%^0K~)04>Lcz*m*10
zs>NzOL+B)ttzwrdh+G_LtM*~_Wl5lGg~&v7mhZ~5HXtH8iRdijr63l8nE9z~)%MFL
zON)D@$aQc<9Dh%6@*Rzh+E?)}-_y>gm&v1;@63!IO<HEw%p#5g)V3_kqSt;~&#H{p
zIMj^MOxjzjo{W~`WF}^|jc!Jd9RJ#{29L-gtz*<bwI!O}>!ar(lSf;vmez4v`<XYm
zZ!FTvYH$nfS?PZhI&8zz`uz(400000003KUGiQ!7y>9QfZbD{uq_cKXcZRdn2kjo=
z>su6!kiBslJF`i(MMYRd>4`JC${N{>va@wYM^;6zN;2$Zoa<Z%*rP}P;~!r#;=NZ)
rSRRl^mgmeRZ_f^ngaH5m0PtQupn0-N^ZKYq00000NkvXXu0mjf%Ykdw

delta 717
zcmV;;0y6#22BQX$J%2zP#b47(MJo<=DB_TzI$02v;wV)tf`!snXw|{w(l2OYNK#xJ
z1=oUuAB$B77iV1^Tm?b!1H{$ENzp}0{9jUN5#zyeKi=JY+`R*YW{s(4U;<Dz%g7`X
zV!p5<24CSv0R4y~A~91>WfyYr9AEeF@%1jov%Js!IR=!X$$tQ!NIc7Q!y;ZMj&E8z
z=Y8TZt4Ip*Iq|qb7bJe<y6o~B=d!~B&kP&6%p7r;SS)w3+{LV7sKnF6QAO1#U&y<x
zaNgpq*6OT%PyWJCQCrS(o#qIVSVRhGh>%f76*X9h(W;SRB18KL5C5>^Pm@a~R~3vL
z^Von2$?=2#!GG^=&C=AQn-od_JukNXF$x5CfmXw|zmILZbprUGfh(=!-)I6epQJZB
zTJ#7Q+y*YLJDR))T<!poCtWfmNAlAYN+sa^jJ~M=4BY~Kt8Q=YeVjf3IqGWZ1~@nb
z#>$kv=JD>{?%w`A)9&vFfo*cF`dHe400006VoOIv0F$}_DSrhGI~<pQD_j5o0U$|4
zK~!ko?V4c@gD?n%t?^hKpL^*q5<;{CR=TP0OO`aImhzxPamxY#0OMiiotgK4S?8{-
zvx0RthR{VKN5z&?FfurHEo~!eE0RF#43UYb$u${!9U`JeL`~*fK_UV%^RCy@>&vf7
zi*2UJ+Bp#?<A0pJ$FqjECHC!o-u+x<a?j_jGNXH&wwd)!5PJ@KOI9T4+V0udmC+u9
zo;jXPXOC(oqwPGKiIrvJGNXHjpZ3&{5qU`I=+#f}5v{KEqxWHx$9q~MrK3gbS=PB<
z1Zn1JNDG~b^xK3U_QG=Z{0jg8000000JCuSUNbK&wnD-FW}!>Ju;@m+2><qvv}Js1
zDI%i*gnp#ZsHr!|X#JM}8#uIG0RR9104g{DgO5K!+qKLo00000NkvXXu0mjfvQ|{>

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 54ab55958412f706096ff5974c650784cd950eec..c0afe1cb225b7415257a4f7d1d11cd5641b3a22c 100644
GIT binary patch
delta 1206
zcmcgrziSjh6n^t=H+#RmA2|tH7__iSxXwyUBLo!@jNLU#>?Af85k%GtSer0f$CQFa
zU{y}kLu5+9xlaE8A#h-MV16*Z_huuvCWR<Ew>#gyZ{C}C`+c*$lk2mq%c`|@cNo6_
z8Nn%!QPX2#&SUAT$I2a#M;1KRpLv`-?J+YqDB@euJ!RKze|pfhZ*1SbvhQqv&>gJU
z9v2{h{-D;>89fut)zi+rzym+(>y=}OTlzg7jdPx)xdVYIgE9`#1cU+M9vCPXMUjG1
z1|5_s4k&wqv&^kOtB?P7gG{}12+q+<xIMy<Fo10b{6n`xGq@ZrAbjUXx+bn>Ly1P|
z;?L||CXjZ!&0>w4FexV3w|0}He>r$yd$y<R!DHQy&el0`Y=mvmJ-j5khl~459dL&J
zwrI~v2C!=YOb)gUsc*=I9h#Zoyb(Y8>vsv+4r!ky@+j>UlcoQy*&)5+fAD4*^GQW^
zjZ{3$|IxKyJw9Oi0U|vG=$6>I@l%kOQ*hxtIlrnG@CxReVs*aFR%3oX`HWMD#T&vF
z?=xE{K1mON?uO5kFX4v5@{kgat4OLUCz8$Rro!q&sj6-WTYa5eEId_M>j+z07Pj^%
pnJ%3}Y<v>7F_aF?{cl^(Rxc-8m2V1L^ODe7l(N>nq+FX(KLB(YajpOW

delta 276
zcmbQQyF+P0Iiujjiq{cK7{Gw}283p-gU}p25SsH1gywOA(0m6VGzuvM<bg0F5OZ9Z
ze_@}3r_1Eqj58+hV)tiaS~J;RREmk|#N-D|VoXdAHrsPZFfp<G0*kVWfkj#MHurLc
zFfp;WfJNCCfJNDNY!>HDVPxWz1B-H6fkiokHgDuxz{te)1uV)f02bxe*xW8)$Hc^&
r0T$(L0gLj^+5B6`iHV8-0a%p(4@i_#Km_Xg$vk4dlLf>)fw&(4wOl(4