Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaner liquid display + Display item rate

Browse Source
This commit is contained in:
MEEPofFaith
2024-03-19 12:22:32 -07:00
parent 66893e5c85
commit c3823b8477
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/ui/LiquidDisplay.java
View File

@@ -26,13 +26,13 @@ public class LiquidDisplay extends Table{
i.setAlign(Align.left); i.setAlign(Align.left);
add(i); add(i);
if(amount != 0){ if(!perSecond && amount != 0){
Table t = new Table().left().bottom(); Table t = new Table().left().bottom();
t.add(Strings.autoFixed(amount, 2) + (perSecond ? StatUnit.perSecond.localized() : "")).style(Styles.outlineLabel); t.add(Strings.autoFixed(amount, 2)).style(Styles.outlineLabel);
add(t); add(t);
} }
}}).height(size).left(); }}).height(size).left();
add(liquid.localizedName).left().style(Styles.outlineLabel); add(liquid.localizedName + (perSecond && amount != 0 ? "\n[lightgray]" + Strings.autoFixed(amount, 2) + StatUnit.perSecond.localized() : "[]")).left().style(Styles.outlineLabel);
} }
public LiquidDisplay(Liquid liquid, float amount, boolean perSecond){ public LiquidDisplay(Liquid liquid, float amount, boolean perSecond){

1
core/src/mindustry/world/blocks/power/ConsumeGenerator.java
View File

@@ -64,6 +64,7 @@ public class ConsumeGenerator extends PowerGenerator{
@Override @Override
public void setStats(){ public void setStats(){
stats.timePeriod = itemDuration;
super.setStats(); super.setStats();
if(hasItems){ if(hasItems){