From 11dcbe19f40b5054fad739f2ecb48dae4c1a0a01 Mon Sep 17 00:00:00 2001
From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Sat, 16 Mar 2024 15:16:15 -0700
Subject: [PATCH] Better LiquidDisplay

---
 core/src/mindustry/ui/LiquidDisplay.java      | 20 ++++++++++---------
 core/src/mindustry/world/meta/StatValues.java | 11 +---------
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/core/src/mindustry/ui/LiquidDisplay.java b/core/src/mindustry/ui/LiquidDisplay.java
index d0982374ab..84cd9db95f 100644
--- a/core/src/mindustry/ui/LiquidDisplay.java
+++ b/core/src/mindustry/ui/LiquidDisplay.java
@@ -15,25 +15,27 @@ public class LiquidDisplay extends Table{
     public final float amount;
     public final boolean perSecond;
 
-    public LiquidDisplay(Liquid liquid, float amount, boolean perSecond){
+    public LiquidDisplay(Liquid liquid, float size, float amount, boolean perSecond){
         this.liquid = liquid;
         this.amount = amount;
         this.perSecond = perSecond;
 
+        left();
         add(new Stack(){{
-            add(new Image(liquid.uiIcon).setScaling(Scaling.fit));
+            Image i = new Image(liquid.uiIcon).setScaling(Scaling.fit);
+            i.setAlign(Align.left);
+            add(i);
 
             if(amount != 0){
                 Table t = new Table().left().bottom();
-                t.add(Strings.autoFixed(amount, 2)).style(Styles.outlineLabel);
+                t.add(Strings.autoFixed(amount, 2) + (perSecond ? StatUnit.perSecond.localized() : "")).style(Styles.outlineLabel);
                 add(t);
             }
-        }}).size(iconMed).padRight(3  + (amount != 0 && Strings.autoFixed(amount, 2).length() > 2 ? 8 : 0));
+        }}).height(size).left();
+        add(liquid.localizedName).padLeft(6f).left();
+    }
 
-        if(perSecond){
-            add(StatUnit.perSecond.localized()).padLeft(2).padRight(5).color(Color.lightGray).style(Styles.outlineLabel);
-        }
-
-        add(liquid.localizedName);
+    public LiquidDisplay(Liquid liquid, float amount, boolean perSecond){
+        this(liquid, iconMed, amount, perSecond);
     }
 }
diff --git a/core/src/mindustry/world/meta/StatValues.java b/core/src/mindustry/world/meta/StatValues.java
index 5ebb83ba34..6017315a44 100644
--- a/core/src/mindustry/world/meta/StatValues.java
+++ b/core/src/mindustry/world/meta/StatValues.java
@@ -314,16 +314,7 @@ public class StatValues{
             table.table(c -> {
                 for(Liquid liquid : content.liquids().select(l -> filter.get(l) && l.unlockedNow() && !l.isHidden())){
                     c.table(Styles.grayPanel, b -> {
-                        b.add(new Stack(){{
-                            Image i = new Image(liquid.uiIcon).setScaling(Scaling.fit);
-                            i.setAlign(Align.left);
-                            add(i);
-
-                            Table t = new Table().left().bottom();
-                            t.add(Strings.autoFixed(amount, 2) + StatUnit.perSecond.localized()).style(Styles.outlineLabel);
-                            add(t);
-                        }}).height(40).pad(10f).padRight(0).left();
-                        b.add(liquid.localizedName).left().padLeft(6f).grow();
+                        b.add(new LiquidDisplay(liquid, 40f, amount, true)).pad(10f).left().grow();
                         b.add(Core.bundle.format("stat.efficiency", fixValue(efficiency.get(liquid) * 100f))).right().pad(10f).padRight(15f);
                     }).growX().pad(5).row();
                 }