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

Un-lonely the liquid display

Browse Source
This commit is contained in:
MEEPofFaith
2024-03-25 10:48:21 -07:00
parent 92485bd4e6
commit a3a7598e6d
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@ public class LiquidDisplay extends Table{
t.add(Strings.autoFixed(amount, 2)).style(Styles.outlineLabel); t.add(Strings.autoFixed(amount, 2)).style(Styles.outlineLabel);
add(t); add(t);
} }
}}).height(size).left(); }}).height(size).minWidth(size).left();
add(liquid.localizedName + (perSecond && amount != 0 ? "\n[lightgray]" + Strings.autoFixed(amount, 2) + StatUnit.perSecond.localized() : "[]")).left().style(Styles.outlineLabel); add(liquid.localizedName + (perSecond && amount != 0 ? "\n[lightgray]" + Strings.autoFixed(amount, 2) + StatUnit.perSecond.localized() : "[]")).left().style(Styles.outlineLabel);
} }

1
core/src/mindustry/ui/dialogs/ContentInfoDialog.java
View File

@@ -82,7 +82,6 @@ public class ContentInfoDialog extends BaseDialog{
value.display(inset); value.display(inset);
inset.add().size(10f); inset.add().size(10f);
} }
}).fillX().padLeft(10); }).fillX().padLeft(10);
table.row(); table.row();
} }

2
core/src/mindustry/world/meta/StatValues.java
View File

@@ -294,6 +294,7 @@ public class StatValues{
public static StatValue itemEffMultiplier(Floatf<Item> efficiency, Boolf<Item> filter){ public static StatValue itemEffMultiplier(Floatf<Item> efficiency, Boolf<Item> filter){
return table -> { return table -> {
table.getCells().peek().growX(); //Expand the spacer on the row above to push everything to the left
table.row(); table.row();
table.table(c -> { table.table(c -> {
for(Item item : content.items().select(i -> filter.get(i) && i.unlockedNow() && !i.isHidden())){ for(Item item : content.items().select(i -> filter.get(i) && i.unlockedNow() && !i.isHidden())){
@@ -309,6 +310,7 @@ public class StatValues{
public static StatValue liquidEffMultiplier(Floatf<Liquid> efficiency, float amount, Boolf<Liquid> filter){ public static StatValue liquidEffMultiplier(Floatf<Liquid> efficiency, float amount, Boolf<Liquid> filter){
return table -> { return table -> {
table.getCells().peek().growX(); //Expand the spacer on the row above to push everything to the left
table.row(); table.row();
table.table(c -> { table.table(c -> {
for(Liquid liquid : content.liquids().select(l -> filter.get(l) && l.unlockedNow() && !l.isHidden())){ for(Liquid liquid : content.liquids().select(l -> filter.get(l) && l.unlockedNow() && !l.isHidden())){