From 808bfee8da6598ebd8407ebdb0664341529b29ba Mon Sep 17 00:00:00 2001
From: = <uujuju41@gmail.com>
Date: Sun, 19 Jan 2025 18:55:23 -0300
Subject: [PATCH] gauge resprite again remove fluidCapacity for pump add
 pressure bar for liquid source

---
 .../blocks/liquids/liquid-gauge-pointer.png     | Bin 211 -> 157 bytes
 .../blocks/liquids/liquid-gauge-tiles.png       | Bin 724 -> 576 bytes
 assets/sprites/blocks/liquids/liquid-gauge.png  | Bin 502 -> 432 bytes
 .../world/blocks/liquid/PressureLiquidPump.java |   3 +--
 .../blocks/sandbox/PressureLiquidSource.java    |  11 +++++++++++
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/assets/sprites/blocks/liquids/liquid-gauge-pointer.png b/assets/sprites/blocks/liquids/liquid-gauge-pointer.png
index b8df1cbfab802b4dbcce9b423e55c6f28e73cd46..8cfa110f9d6a3f758261f8252dcb7544f402dbbb 100644
GIT binary patch
delta 107
zcmV-x0F?jJ0i6MmIb=^sL_t(oh3%C|3IHGs#9IIV=kX>e^xz;AA-Q)9bTI;;nRE*!
zX$#7<vW6@03Iq^9z}nsO2COjS7F-upkGm4>EkNMEA*>|a-w*%*U;;B~6dF}a|1|&r
N002ovPDHLkV1h%@Da-%>

delta 162
zcmbQsc$sm6Wqqrsi(^PcYjT1F>*55Fo~A&90}T^ndiVXy{6F#MZ1ZzUr*$@&ER6Q+
zRQ9;maJq;M2(pchMfNS)qr?mZ&J{hze$_KFQZ0=lcBbh2)v8!F$eiZ1Y|`Rez!Gqj
z(cOQp(h9b4D}|GcKY}dn+#h(iIO|J4Dq`8mdQk&tr8LM+Ms|kvx77qLu;`s<00K`}
KKbLh*2~7ay2s)Vn

diff --git a/assets/sprites/blocks/liquids/liquid-gauge-tiles.png b/assets/sprites/blocks/liquids/liquid-gauge-tiles.png
index 1b10b2d84b9c4aa0607e29148af712e0573148c2..afcea6c37646e325c468b450b6e3e67540834608 100644
GIT binary patch
delta 531
zcmV+u0_^?N1;7N5IDY~1Nkl<Zc%1E;J#ND=423Bp_b76SEFCi!9lLbyO$y`;LB}jX
zrXX|2F1bX|leCisiu$u;Nn9SMSh4-SNESuE$dHKh>HAN%wT!p-z2V2sL2vO8g#9o|
zTtb+f_~ZBCwf)@h!E>K?JFji~v`s>oR^qh~Q%mvKIiY(c0e@=6Yaq<w^UE26(8agw
z(Rhsu;^p<j8(uj?P7kyck6kM@rq~y2#g{@vXMxOEYa^x;odu%;02@9(QyHsea83Ol
z;0LG6xtkEbH%~_TJy4S4TLsrt?*RbV<v5fBTCE46bzsf~lWfRc*izg9=mC)vCn7RS
zsurU1G`+N}3x7U@rG;g!cobj_L}@{5h{DC=93{h1Dt@~jjh$vGh#oQ5iq1SA1;Gnd
zFVXadkX5n=F#0W7#UBU)Xoy<?Eq{P0@n%#iUJC(#0R8~{0rjdF0PqLk55OM)0Q>>?
z1Mmk_{Q(P*gXkG5{y-E!10wlu*dt_i9ljRGAFQ$%aes*H5Mcj6iFoWB_yauP4@fQe
z0|0<O0Dl1f007_*z#o7=ker645LNpJw0wcNR#Ztuyigqu;O!sK`qz98^|e49V3Rwc
z_x^!o50uX9n&bt40R8~{0rf-#0Qdv&2jC9?0R8~{0r&%|{s2+r85kMriAWvbAMU!d
VMdMR*Qw#tA002ovPDHLkV1gNd@E8C9

delta 680
zcmX@Wa)ot*MLkoSr;B4q#hkZM)_%-}0=3;i0SbjIM^rOjEO>U=fh)*)VzEMDqpri0
zg$z=5rY|#gxEv9jpz&hCtb{o;H{N_xwQWYYWvA`?qmREnU#so1WA2`s<M+3AKFrw8
zW&i)@1yf7)q&N*%x$YG~PbUAqy|ly4-8t0ds%m9l$JBKvgE!u&m%AWkV;jT7@M_n;
z&wndy*cjf(&+E+HIZxuuz4RpJPMc77p@W4RHE-Oz<u&QDec$Ox0eWf-A>z-kKT@cv
ztrli})==f7#NJ{k@aRX%azV?7@6uNN)3amEo$&mK0P7aVdBWar8-)beAKv;U-f&d#
zU;Krdk3Tn_`Zw=QW5uCNr*-uQZCE`SPcKnep1ZZY;8b7ZvdR4{nN{!dxweG9-G3oz
zrR{~bju4(w!&`T5uw1AKTT<!}{pqNj!Y6}(o?YvXrrYKSA3G&<z_i1)<;X@3zYQu$
z4%u~nPj}DGG?Kmb>2zV|=Z0;QbD1*dXYSW#V^}HP@U+@VxxQ}Cs%P%TzAoYwK;|#o
zSyROvpKvpIb#R=FWL)ZhQtcmu_JO7vy#uG@8HCi8zq4EHuy-h^R}g>4za(kq{GL1V
z2L6q|ng99%iH6_IMGi{OPsPOgw)|%Pwma#-Ir$mf9-S|Q)c!SS9B^_e3cq9a=r{Ax
z@WVg&XX_ka*pb5Z=bwXgL4Csmpf&Xe{x<5JEXHr@v)xHw4Rf4bKK*N$s_&40(RbOS
z52AI2jNISZ*W8;W{A;(=v_lG^3t#_cUiP^`>%d>eUYpS4e;J#8Gg}(okuRt}V8i;3
z|BE@0V0g!Wg0XXsc5$hx;5+^q@4FPwo@Y(_$FOjJaG~ZOhPeePOIL~JZe{=iPgg&e
IbxsLQ0RB@#<NyEw

diff --git a/assets/sprites/blocks/liquids/liquid-gauge.png b/assets/sprites/blocks/liquids/liquid-gauge.png
index d50da91600cf1103119e4d37d3a6731e59e0d276..42ab6a4de5cdd66297bc4b50b44f314620a25709 100644
GIT binary patch
delta 384
zcmV-`0e}AX1F!>-Ie%hFL_t(oh1Hikj>0eyhR2c5!Q%$0prG7(MVW@08&E*cL)sf4
zN*c5kqNb#P$~WL~5vT(8c<k7YlZdI}iJkA4=V6BdvfcLh#J-r8jeeLsRt8nWDG~37
zy5Lv@D}rC|SIu|2T*$eDUQhFN+g+;&77HFKB8dq%&7r<!6@L&44-vsu^NkV$YVqSH
zG@lS>Wt^scZBDC`YCaqyWd~g0u12lJjKuV!EZkKD&odNf>f&!&8ZL{NO_t<4V-?h8
z-zflBfXU}#T&_=B$8rG)aVE<Vo6KxH1Y90$|96#v<ZsK(sPP?Ozr!(k8rqtWDGzM%
zr`j?=;0{nAmwDu)j2BOF7ZGBO=K#+$Qtts-wDW*E2l8H!U`Nrym~cfv6(Wk@0ERO3
zy;xG_daWaq(Dz~)3O5QUBf|GW%K!jO-4MVp9KP_we$C#$W;PL3*kQl^{F>D*B8O`N
e>JTBr0RUcpEWkREWyp^J0000<MNUMnLSTZf0<seT

delta 455
zcmV;&0XY7!1NH-uIe(~0L_t(og~eApPQySHoJB5?I0DKg($IyPPeW299TF5i01`b2
z4zNWc=#nC#A*3c9O)e2}3p%Jatd}=$*G_Dvve$lZ#_zXlg8<X<`**muOY{cE#=kGz
z)J-ml*jzM49*QtA^6|@bE26<gPZeS6Bu^2sS2uagmly%f;D7CP2mr9w7S{7T2LPO&
zUsGEt650B5O$``%>>VaT;u2GE)NV(~-4}<~OsM1&0L;VP6D`7z)rvYyfr|tq2S^S0
z==M96$Q@>rrTRRpN*?B!MXB5Gs3K?^mLX?rDZbPQq>?*4-ai-aTZgTv09u6m2VVe+
z6|Rv>h2{hRa(@c~N(vmpfs;zEi76$ZZbSuyLq>v|7aCX!%*ol6SOcuB%G7~hgv_pV
z7ihEo=Jv9zJDvjVOQq;&<684YQ;^~~1sXXJ*^E*Ki3T@<wJo2f!0%f&%dNF^PWU!#
z22cT#K`6o}4n;_UnTSm4VfONDvW%uf+xa9eT7=q3wm=HlIrINd#Q>nS;<k~{$QSdG
x+5DQt=E1J9n2&yc&6*bB$o~jvLWEBa06#sV!as-p8=L?D002ovPDHLkV1gQ9(24*6

diff --git a/src/omaloon/world/blocks/liquid/PressureLiquidPump.java b/src/omaloon/world/blocks/liquid/PressureLiquidPump.java
index 91944109..003f12dc 100644
--- a/src/omaloon/world/blocks/liquid/PressureLiquidPump.java
+++ b/src/omaloon/world/blocks/liquid/PressureLiquidPump.java
@@ -17,7 +17,6 @@
 import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
-import mindustry.world.meta.*;
 import omaloon.content.*;
 import omaloon.utils.*;
 import omaloon.world.interfaces.*;
@@ -121,7 +120,7 @@ public void load() {
 	public void setStats() {
 		super.setStats();
 		pressureConfig.addStats(stats);
-		stats.remove(Stat.liquidCapacity);
+		stats.remove(OlStats.fluidCapacity);
 		stats.add(OlStats.pumpStrength, pumpStrength);
 		stats.add(OlStats.pressureGradient, pressureDifference, OlStats.pressureUnit);
 	}
diff --git a/src/omaloon/world/blocks/sandbox/PressureLiquidSource.java b/src/omaloon/world/blocks/sandbox/PressureLiquidSource.java
index bbea7edb..dffd66ae 100644
--- a/src/omaloon/world/blocks/sandbox/PressureLiquidSource.java
+++ b/src/omaloon/world/blocks/sandbox/PressureLiquidSource.java
@@ -1,6 +1,7 @@
 package omaloon.world.blocks.sandbox;
 
 import arc.*;
+import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.scene.style.*;
@@ -16,6 +17,7 @@
 import mindustry.ui.*;
 import mindustry.world.*;
 import mindustry.world.blocks.liquid.*;
+import omaloon.ui.elements.*;
 import omaloon.world.interfaces.*;
 import omaloon.world.meta.*;
 import omaloon.world.modules.*;
@@ -75,6 +77,15 @@ public void init() {
 	public void setBars() {
 		super.setBars();
 		pressureConfig.addBars(this);
+		addBar("pressure", entity -> {
+			HasPressure build = (HasPressure)entity;
+
+			return new CenterBar(
+				() -> Core.bundle.get("bar.pressure") + (build.pressure().getPressure(build.pressure().getMain()) < 0 ? "-" : "+") + Strings.autoFixed(Math.abs(build.pressure().getPressure(build.pressure().getMain())), 2),
+				() -> Color.white,
+				() -> Mathf.map(build.pressure().getPressure(build.pressure().getMain()), pressureConfig.minPressure, pressureConfig.maxPressure, -1, 1)
+			);
+		});
 	}
 
 	public class PressureLiquidSourceBuild extends Building implements HasPressure {