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

Shift the item display over a column instead

Browse Source
This commit is contained in:
MEEPofFaith
2024-03-19 18:37:03 -07:00
parent c3823b8477
commit e40dab9733
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,7 +66,7 @@ public class StatValues{
} }
public static StatValue liquid(Liquid liquid, float amount, boolean perSecond){ public static StatValue liquid(Liquid liquid, float amount, boolean perSecond){
return table -> table.add(new LiquidDisplay(liquid, amount, perSecond)); return table -> table.add(new LiquidDisplay(liquid, amount, perSecond)).left();
} }
public static StatValue liquids(Boolf<Liquid> filter, float amount, boolean perSecond){ public static StatValue liquids(Boolf<Liquid> filter, float amount, boolean perSecond){
@@ -295,7 +295,9 @@ 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.row(); table.row();
table.add().size(0);
table.table(c -> { table.table(c -> {
c.left();
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())){
c.table(Styles.grayPanel, b -> { c.table(Styles.grayPanel, b -> {
b.image(item.uiIcon).size(40).pad(10f).left().scaling(Scaling.fit); b.image(item.uiIcon).size(40).pad(10f).left().scaling(Scaling.fit);
@@ -303,23 +305,23 @@ public class StatValues{
b.add(Core.bundle.format("stat.efficiency", fixValue(efficiency.get(item) * 100f))).right().pad(10f).padRight(15f); b.add(Core.bundle.format("stat.efficiency", fixValue(efficiency.get(item) * 100f))).right().pad(10f).padRight(15f);
}).growX().pad(5).row(); }).growX().pad(5).row();
} }
}).growX().colspan(table.getColumns()); }).growX().colspan(table.getColumns() - 2).row();
table.row();
}; };
} }
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.row(); table.row();
table.add().size(0);
table.table(c -> { table.table(c -> {
c.left();
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())){
c.table(Styles.grayPanel, b -> { c.table(Styles.grayPanel, b -> {
b.add(new LiquidDisplay(liquid, 40f, amount, true)).pad(10f).left().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); b.add(Core.bundle.format("stat.efficiency", fixValue(efficiency.get(liquid) * 100f))).right().pad(10f).padRight(15f);
}).growX().pad(5).row(); }).growX().pad(5).row();
} }
}).growX().colspan(table.getColumns()).row(); }).growX().colspan(table.getColumns() - 2).row();
table.row();
}; };
} }