From 13d5aae33b2eb1960ff8d7fa6d7ce1cb8a4b4c1a Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sat, 8 Oct 2022 16:09:04 +0700 Subject: [PATCH] Use atlas for android research icons, again --- .../mc/otm/client/render/ResearchIcons.kt | 48 ++++++++-------- .../mc/otm/client/render/SubSkinGrid.kt | 53 ++++++++++++++++++ .../gui/android_research/android_stuff-0.png | Bin 417 -> 0 bytes .../gui/android_research/android_stuff-1.png | Bin 443 -> 0 bytes .../gui/android_research/android_stuff-10.png | Bin 430 -> 0 bytes .../gui/android_research/android_stuff-11.png | Bin 399 -> 0 bytes .../gui/android_research/android_stuff-12.png | Bin 422 -> 0 bytes .../gui/android_research/android_stuff-13.png | Bin 445 -> 0 bytes .../gui/android_research/android_stuff-14.png | Bin 460 -> 0 bytes .../gui/android_research/android_stuff-15.png | Bin 434 -> 0 bytes .../gui/android_research/android_stuff-16.png | Bin 408 -> 0 bytes .../gui/android_research/android_stuff-17.png | Bin 413 -> 0 bytes .../gui/android_research/android_stuff-18.png | Bin 436 -> 0 bytes .../gui/android_research/android_stuff-19.png | Bin 434 -> 0 bytes .../gui/android_research/android_stuff-2.png | Bin 417 -> 0 bytes .../gui/android_research/android_stuff-20.png | Bin 422 -> 0 bytes .../gui/android_research/android_stuff-21.png | Bin 403 -> 0 bytes .../gui/android_research/android_stuff-22.png | Bin 402 -> 0 bytes .../gui/android_research/android_stuff-3.png | Bin 409 -> 0 bytes .../gui/android_research/android_stuff-4.png | Bin 433 -> 0 bytes .../gui/android_research/android_stuff-5.png | Bin 413 -> 0 bytes .../gui/android_research/android_stuff-6.png | Bin 412 -> 0 bytes .../gui/android_research/android_stuff-7.png | Bin 433 -> 0 bytes .../gui/android_research/android_stuff-8.png | Bin 440 -> 0 bytes .../gui/android_research/android_stuff-9.png | Bin 406 -> 0 bytes .../textures/gui/android_upgrades.png | Bin 0 -> 2792 bytes 26 files changed, 77 insertions(+), 24 deletions(-) create mode 100644 src/main/kotlin/ru/dbotthepony/mc/otm/client/render/SubSkinGrid.kt delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-0.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-1.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-10.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-11.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-12.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-13.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-14.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-15.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-16.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-17.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-18.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-19.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-2.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-20.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-21.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-22.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-3.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-4.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-5.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-6.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-7.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-8.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-9.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/android_upgrades.png diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/ResearchIcons.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/ResearchIcons.kt index 6bb570ef3..02abfc9ee 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/ResearchIcons.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/ResearchIcons.kt @@ -34,30 +34,30 @@ object ResearchIcons { val KOT = ResourceLocation(OverdriveThatMatters.MOD_ID, "textures/block/ph_kitty.png").element(0f, 0f, 32f, 32f, 32f, 32f) init { - var i = 0 + val grid = SubSkinGrid(AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_upgrades"), 126f, 126f), 18f, 18f, 7, 7) - ICON_TRANSFER = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}"), 18f, 18f) - ICON_ATTACK_BOOST = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}"), 18f, 18f) - ICON_PLASMA_SHIELD_BOOST = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}"), 18f, 18f) - ICON_CLOAK = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}"), 18f, 18f) - ICON_GRAVITATIONAL_STABILIZER = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}"), 18f, 18f) - ICON_AIR_BAGS = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}"), 18f, 18f) - ICON_JUMP_BOOST = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}"), 18f, 18f) - ICON_FEATHER_FALLING = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}"), 18f, 18f) - ICON_ITEM_MAGNET = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}"), 18f, 18f) - ICON_ARROW = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}"), 18f, 18f) - ICON_ARMOR = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}"), 18f, 18f) - ICON_NANOBOTS = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}"), 18f, 18f) - ICON_NIGHT_VISION = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}"), 18f, 18f) - ICON_OXYGEN_SUPPLY = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}"), 18f, 18f) - ICON_PLASMA_SHIELD = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}"), 18f, 18f) - ICON_SHOCKWAVE = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}"), 18f, 18f) - ICON_LIMB_OVERCLOCKING = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}"), 18f, 18f) - ICON_STEP_ASSIST = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}"), 18f, 18f) - ICON_ENDER_TELEPORT = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}"), 18f, 18f) - ICON_WIRELESS_CHARGING = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}"), 18f, 18f) - ICON_UNKNOWN = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}"), 18f, 18f) - ICON_EXTENDED_REACH = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}"), 18f, 18f) - ICON_PHANTOM_ATTRACTOR = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}"), 18f, 18f) + ICON_TRANSFER = grid.next() + ICON_ATTACK_BOOST = grid.next() + ICON_PLASMA_SHIELD_BOOST = grid.next() + ICON_CLOAK = grid.next() + ICON_GRAVITATIONAL_STABILIZER = grid.next() + ICON_AIR_BAGS = grid.next() + ICON_JUMP_BOOST = grid.next() + ICON_FEATHER_FALLING = grid.next() + ICON_ITEM_MAGNET = grid.next() + ICON_ARROW = grid.next() + ICON_ARMOR = grid.next() + ICON_NANOBOTS = grid.next() + ICON_NIGHT_VISION = grid.next() + ICON_OXYGEN_SUPPLY = grid.next() + ICON_PLASMA_SHIELD = grid.next() + ICON_SHOCKWAVE = grid.next() + ICON_LIMB_OVERCLOCKING = grid.next() + ICON_STEP_ASSIST = grid.next() + ICON_ENDER_TELEPORT = grid.next() + ICON_WIRELESS_CHARGING = grid.next() + ICON_UNKNOWN = grid.next() + ICON_EXTENDED_REACH = grid.next() + ICON_PHANTOM_ATTRACTOR = grid.next() } } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/SubSkinGrid.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/SubSkinGrid.kt new file mode 100644 index 000000000..9b82bdedb --- /dev/null +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/SubSkinGrid.kt @@ -0,0 +1,53 @@ +package ru.dbotthepony.mc.otm.client.render + +@Suppress("unused") +data class SubSkinGrid( + val parent: AbstractSkinElement, + val width: Float, + val height: Float, + val rows: Int = 16, + val columns: Int = 16, +) { + var row = 0 + var column = 0 + + val currentX: Float get() = column * width + val currentY: Float get() = row * height + + fun skip(): SubSkinGrid { + column++ + + if (column >= columns) { + jump() + } + + return this + } + + fun jump(): SubSkinGrid { + row++ + column = 0 + return this + } + + fun next(): AbstractSkinElement { + val element = parent.subElement(currentX, currentY, width, height) + skip() + return element + } + + fun reset(): SubSkinGrid { + row = 0 + column = 0 + return this + } + + fun seek(row: Int, column: Int): SubSkinGrid { + this.row = row + this.column = column + return this + } + + operator fun get(column: Int, row: Int) = + parent.subElement(column * width, row * height, width, height) +} diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-0.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-0.png deleted file mode 100644 index ced7098bf56d6c058b810630ff1c74eabefa8d7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 417 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5n0T@z_%ZS87)|YRe*x*C7!;n?9aH^x#UbkPV?{rg%Uhn978;gzn$#J#h}Q;eD>e} z^B)yNMJML2Zo0tu@zN2NEH8Bh&*?G7y;E5on51^co;_ZD^!l-~BU|^z2~SB3%JC6( zn^O8lR87oP=Xp8n0`ZvW1;VS}{OU~Fcu<9->H3N4a@VVC9cwNE?NTjqjVMV;EJ?LW zE=mPb3`Pbk4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5n0T@z_%ZS87)|YRe*x*C7!;n?9aH^x#UbkPV?{rg{nMV978;gzn$dB*I>ZGa`WH+ z^RF27c-8RkJwKq93b5-@mop}q_ z#p_L%|HyD|s`qobPOhCmSE!b_MwFx^mZVxG7o`Fz1|tI_BV9uST?6wFLjx;gATrT5 zFt9Q(I8uM&7>b76{FKbJO57T@Diu@#HE6(XD9OxCEiOsSEx^=cY7DXD;s3NXKs^ke Lu6{1-oD!Mk4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5n0T@z_%ZS87)|YRe*x*C7!;n?9aH^x#UbkPV?{rg>pSz978;gznyfD?|=e_^Tq%F z({>$Bn$j!qO3!d|x-RUFnalL&q|MNO#ySK|iv}BiX`^X0Fl&h<1 z0$QwE;u=wsl30>zm0Xkxq!^40jEr;*4Rj66Lktb9jDg5R+rYrez~D&ziDM`la`RI% x(<*Um*s4@e1=OGcx1l66H?_DVF}DCykEt=ll867()&TV|c)I$ztaD0e0s!I$fUN)k diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-11.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-11.png deleted file mode 100644 index 54f1f364274ed63f9fb8b538350204ba55f105ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 399 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5n0T@z_%ZS87)|YRe*x*C7!;n?9aH^x#UbkPV?{rh5S5S978;gznx^r2XqQE_y7OJ zvZWUiCY~%1Rt%5|dSLGnG;@2YD8rd+Ub|$<%PP`dYB+RlTYTEQ&PL9&+QT;RdE^2; zk6^d+PM1x5IhoaX<-gA?jur%(tXkq4QIe8al4_M)lnSI6j0}v7bPWx34a`Ff4XliT z$VA(~z{nC}Q!>*kackJBR8R%fpaHj`Br`X)xFj*R08@{tF~pLG|I^k0 P^)Pt4`njxgN@xNAagA-w diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-12.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-12.png deleted file mode 100644 index 5d932b09bf893f511f1b746828efa32ffb395dd4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5n0T@z_%ZS87)|YRe*x*C7!;n?9aH^x#UbkPV?{rg;G6T978;gzn$dGcR+!|W$DL% z;q&sO>`$5`9+z`qR{I(ORU%&@j_YDP&6Oncd~z-#>JJFuf$} ztnK1$K3W&*4qdDK_HEgM_{ft5RV;hkdJ@=Jg4cNKbUm_)n{Ysh%}OdI256ybiEBhj zN@7W>RdP`(kYX@0Ff!6LG|)9L4>2^bG6o_OZ36=<1A`;=Cyt?L$jwj5OsmALVXIO> p6;Oi)+=i0O+|=Td#M}Z*J*LJGOCJ7DTLaX?;OXk;vd$@?2>@vQfH437 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-13.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-13.png deleted file mode 100644 index 20fb65d37a60c207f0cfbe96f7ee8a00f31f7536..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 445 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5n0T@z_%ZS87)|YRe*x*C7!;n?9aH^x#UbkPV?{rg=#!q978;gzYTHZJD|X^`Op9J zZydw~?=qa-#Jx9Tfy2tqwY&*(=XDLzr7n0mrrDi+YB_;7Wp+T{KS$<0-0VzTGv;?R zyyr~$*QI6X&-_)?Eh}Z$M~CTm%I`D3(A;(Am@L0eX&*~i#InDlOKSd$`b5p%(YWs6 z3ujFcuKf>~q+IQoL$vM~1Kpuo;u=wsl30>zm0Xkxq!^40jEr;*4Rj66Lktb9jDg5R z+rYrez~D&ziDM`la`RI%(<*Um*s4@e1=OGcx1l66H?_DVF}DCykEt=ll867()&TV| Nc)I$ztaD0e0sxv|g}?v+ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-14.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-14.png deleted file mode 100644 index 45972813e09900c831fd1ed32e8c8666999c4c23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 460 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5n0T@z_%ZS87)|YRe*x*C7!;n?9aH^x#UbkPV?{rg}Oam978;gzYTWeJD|X^_}~BY zcO7RMcXTY5%~|B=%*fqkq2PJbVdmtuPZ_WB&bT<6yNO}ygVu=4t`1!b-o_gl+*-%> zN+Q)OV?s^S-cy}Fgtok2qPO*$#^Pw(uX8pUS!h(MJ<{BJwo$13SDs175!<>Z*@Ep& zhQax28}7QDy;AR-b>OW+s>zNWJAQD>J=qug=9%5BZ9r$KmbgZgq$HN4S|t~y0x1R~ z10y3{Ljzp{^AJM=D`Oxs(Kax!GB7w&f8rR5hTQy=%(P0}8n!AGQ~@<;z-=hW%uOvW dNz5(4)MIK4vEk4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5n0T@z_%ZS87)|YRe*x*C7!;n?9aH^x#UbkPV?{rg$g}g978;gzn$dGb-;kb<@kfY z>vP1DvQ_MNYk$pEd9lKW#g6}HI|qY6<{s~is|$L)_NM6a^X6>2zuTA?1GCbrnbwaJgD?qzMNOL>(Ta@Pf-Q} z4<~&Ac~7;(HKHUXu_V+oZULqqQ)7rF5C5mF0qSA!boFyt=akR{09J5- Ay8r+H diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-16.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-16.png deleted file mode 100644 index d960d149cf594c99d745799034d3f4484958ff08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 408 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5n0T@z_%ZS87)|YRe*x*C7!;n?9aH^x#UbkPV?{rg~B~u978;gzn$dG#~{GtBKUp( zryCq!J+~ZoyRnC}Q!>*kackJBR8R%fpaHj`Br`X)xFj*R b08@{tF~pLG|I^k0^)Pt4`njxgN@xNAQM!4m diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-17.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-17.png deleted file mode 100644 index c950e82db27253edbd37f878ef5174c1c10c5443..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 413 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5n0T@z_%ZS87)|YRe*x*C7!;n?9aH^x#UbkPV?{rg0CN%ppeXv*2T>ShF7sHd7rE?xn7CoE!YmbB1vA#LwpSDCKrEh4f z&^h?eY+m4mYu^t#{o8fh`>f5wI|AK{cFg6oUZ?n5yy+Imb*d$<5hW>!C8<`)MX5lF z!N|bKNY~In*T6i)(7?(Vh)lE%46Fk4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5n0T@z_%ZS87)|YRe*x*C7!;n?9aH^x#UbkPV?{rg^E30978;gzYTWeJD|WJ{O^By zSwbiCGo75}t#UmRg1BEv#5=pF99EC7Tc)WjScOs|UF-LX4`xvVvH zO4ex;W>24}9L5P7ret%^IPy9=VbSuL-EZcZY9EZA|M6Y;1X(HFB!;WY?_`+NH8Wer z=B`f8e6DH82k`G_W!TA`@)`11kfABlRba zp=ij>PsvQH#I0egQb83^g9hA&lFZ!H;*!MN0!%%o#t=&${!d#2)WhKE>gTe~DWM4f D|EPk4 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-19.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-19.png deleted file mode 100644 index 926a15760360da274e953d80a5a5114a8bb157cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 434 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5n0T@z_%ZS87)|YRe*x*C7!;n?9aH^x#UbkPV?{rg$g}g978;gznyH!cR+!M<$A~e z`pRH|DIE;Q$|fF*RyzBGp&{49#i>n1wp3ec#luBc#S1y5)*bXdXlW-J@uBlT+x;fK zxq5j5HsY#G6U1aR4j%9Nl{ah4R(^(5n+;_lYemJCf9yY#-tvHN5p$~1%>PA325JLkiV<0loHZZUwkj1=0X1mAZ79jiO)V}-%q_swV`>bszopr0Q|In A3;+NC diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-2.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-2.png deleted file mode 100644 index 0bc0246137f74099dfdd2e4dd38994682f074f6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 417 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5n0T@z_%ZS87)|YRe*x*C7!;n?9aH^x#UbkPV?{rg%Uhn978;gzYTKa0y<^$i~sR) z?Mhs}-AxL2RHcf8yH5xn(++sKAxpsDx+8hho&HP)kEEG%-z?zxebREV)QL##)hRQp zpSpC4Gg_a&amoANn-F&c)hzSvc9)!)+Yf)_HS)Tq`RBy}CJCTjswJ)wB`Jv|saDBF zsX&Us$iT=**U&)Mz&ymzz{(hiOtcLQtPBi})Sozpq9HdwB{QuOw}!1s1yw)|8gLs* iGILXlOA>PnF!h)kLo9jtKWzk4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5n0T@z_%ZS87)|YRe*x*C7!;n?9aH^x#UbkPV?{rg;G6T978;gzYTQc0y^dNzyImh zCpc72Z1j7mz&R^>mtow2x%HZp*9j@?c>E^XHK{3O+sVMQTFgGB^_~hfE=yVb$_%fG zCUMOa(F}MS*^@mf*dzPUdmp|>9GjS}w;Bt55|ZvcW*#v=&GyM}`Hobeg{md45hW>! zC8<`)MX5lF!N|bKNY~In*T6i)(7?(Vh)lE%46Fk4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5n0T@z_%ZS87)|YRe*x*C7!;n?9aH^x#UbkPV?{rg@Qa?978;gznx&n#h}2$EdB9+ zd|z{yXjfQFaj;{Rp{elwgkF^dw?1|o&J+8Lu7B<^Tk zT5;}cM{TM9xoHAU9EO>#g<=Ad*FN3@nyy;n8c~vxSdwa$T$Bo=7>o>zjC2hRbPdcy z3=OP|fyhMLz`)AD;7I+6V<;MO^HVa@DsgMrs#H(~)Sv;kp(HamwYVfPw*XU*sWHTo UhyT;o0QE3k4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5n0T@z_%ZS87)|YRe*x*C7!;n?9aH^x#UbkPV?{rg#tZY978;gCnrdlJosOKNXbR= zZpP6RPQ#k!!m&Fwi#%+YKdz^NlIc#s#S7PDv)9@GB7gIH8jvQFb^>_ zurdZB6Kw+nD+7Zg^(T&@Xvob^$xN%ntzoNDK^0Jg2Hb{{%-q!ClEmBsOg*N?5KA8Z SPg?`j!{F)a=d#Wzp$P!q$8wk4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5n0T@z_%ZS87)|YRe*x*C7!;n?9aH^x#UbkPV?{rg(5s%978;gCnqd0`|E?CDsq1Jzm^oo~EUoNPh;}zM>aI&t0`$DErOv9^`N6JF&-Ws2H zG*`{kxa_y_?-s`9gS?9qM0%PS85q`_R{T-Fw?PzWhiZvyL`h0wNvc(HQ7VvPFfuSQ z(ls>DH82k`G_W!TA`@)`11kfABlRbap=ij>PsvQH#I0egQb83^g9hA&lFZ!H;*!MN b0!%%o#t=&${!d#2)WhKE>gTe~DWM4fbc=U^ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-4.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-4.png deleted file mode 100644 index 03eb6d1f84a8ab0fae66de7ae58970577c1181d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 433 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5n0T@z_%ZS87)|YRe*x*C7!;n?9aH^x#UbkPV?{rg$g`f978;gzn$dB#h}Q;eEYw> zRkg+5giD#p^S7 zpEpxvoP9&%-@z=VnCAsd`EL#~CT(X|0^*{kuW~O~ZPx8F-Z0;L>81EDjIvKx#=L&G z{T;&Q5X)(U6;; yl9^VCTfk4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5n0T@z_%ZS87)|YRe*x*C7!;n?9aH^x#UbkPV?{rg%#y4 z&&IGPtt#8tzm(a0Mn(~Tz}Y%($0=XZrW)v3g!ud%XjT(J0bi>h$*Pt zK6pEWQu+Oo=#r-wb9`1^jjh)B`*&I9EGzT-s|?Nxzfye+oZULqqQ)7rF5C5mF0qSA!boFyt=akR{0JDF42><{9 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-6.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-6.png deleted file mode 100644 index e7b54acef670885b39ac90adf6bb45076b1acb5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 412 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5n0T@z_%ZS87)|YRe*x*C7!;n?9aH^x#UbkPV?{rg`z!O978;gzn!>|mqC$-nK$YG zRNsS(#YM`zxZ)dGn!J4)E-*CwG3&ka+ODu^;rfYw7sG2mt*_GN68sW;*I7Jo_I-{l zjz;hO66v?9dt4j6q9qn*?ff=TvE>7saQH77Q5hbAb3kiUOI#yLQW8s2t&)pUffR$0 zfsv7}p@FV}d5EEbl`#;RXd4(<85kU?KXD92LvDUbW?Cg~4O^88s(>0a;5L+G=B5^x dB<2=i>M=EjSn}|H+8Ur922WQ%mvv4FO#nytb*}&b diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-7.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-7.png deleted file mode 100644 index 99e2c4e9c4ef3376fb369bb157035c6dd82abadd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 433 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5n0T@z_%ZS87)|YRe*x*C7!;n?9aH^x#UbkPV?{rg$g`f978;gzn$bQ#30Dy;(GS) zdKvC19Se-5XYc6^*!5I->GcVB47NM3GMsogLCiz@M8nK8G4I5F>g=EVeC;%)Sb;@S zh0K17;$>HFv-!BTEZ|ld|1k~Q+>ou&u8opkw(oV#xnDG0k@bf}ecb~Ej;5(h?grlX zGu#>sfp)8wxJHzuB$lLFB^RXvDF!10BO_fy16>325JLkiV<0loHZZUwkj1=0X1mAZ79jiO)V}-%q_swV`>bszopr08XWW A+5i9m diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-8.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-8.png deleted file mode 100644 index d187cfbf9b79ffa9fa883900220bf5f3125e8f36..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 440 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5n0T@z_%ZS87)|YRe*x*C7!;n?9aH^x#UbkPV?{rg~~l$978;gznyrHuR(#wS@Zw@ zv#Z%-SXxqIZ7LRUihn7M)qKi5@kxzv>g!W}hK~QGA80&q_j9n*5Qs^A=McH*o&8po zk5yDDYHf9oPu~1=%-!AH z{wnLk@A(VQ9^JMT=mgag*NBpo#FA92k4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5n0T@z_%ZS87)|YRe*x*C7!;n?9aH^x#UbkPV?{rg+e`D978;gznx^x$DqK&Ec@?& z`sM%@AyXcneTz5_;+H9z$1C3&7bXWA3O4SInV;t64!{5l*E!$tK_0oAjM#0U}U6g zXrOCg9%5)9nO2Eg!&aq&Dxd}pxD6$lxv9k^iMa)s ZdQ6QWmOT8Qwg#w&!PC{xWt~$(699ltcUk}d diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_upgrades.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_upgrades.png new file mode 100644 index 0000000000000000000000000000000000000000..8deae1d89b471315e9704158fa0ce8b322d20c56 GIT binary patch literal 2792 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 literal 0 HcmV?d00001