From 92485bd4e65912cc51d6a4552659aa4cab9954eb Mon Sep 17 00:00:00 2001 From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com> Date: Tue, 19 Mar 2024 18:45:09 -0700 Subject: [PATCH] Revert "Shift the item display over a column instead" This reverts commit e40dab9733cf1eaeda14c83ef98f05004414742a. --- core/src/mindustry/world/meta/StatValues.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/core/src/mindustry/world/meta/StatValues.java b/core/src/mindustry/world/meta/StatValues.java index b5900d206a..f4fd1e5b9b 100644 --- a/core/src/mindustry/world/meta/StatValues.java +++ b/core/src/mindustry/world/meta/StatValues.java @@ -295,9 +295,7 @@ public class StatValues{ public static StatValue itemEffMultiplier(Floatf efficiency, Boolf filter){ return table -> { table.row(); - table.add().size(0); table.table(c -> { - c.left(); for(Item item : content.items().select(i -> filter.get(i) && i.unlockedNow() && !i.isHidden())){ c.table(Styles.grayPanel, b -> { b.image(item.uiIcon).size(40).pad(10f).left().scaling(Scaling.fit); @@ -305,23 +303,21 @@ public class StatValues{ b.add(Core.bundle.format("stat.efficiency", fixValue(efficiency.get(item) * 100f))).right().pad(10f).padRight(15f); }).growX().pad(5).row(); } - }).growX().colspan(table.getColumns() - 2).row(); + }).growX().colspan(table.getColumns()).row(); }; } public static StatValue liquidEffMultiplier(Floatf efficiency, float amount, Boolf filter){ return table -> { table.row(); - table.add().size(0); table.table(c -> { - c.left(); for(Liquid liquid : content.liquids().select(l -> filter.get(l) && l.unlockedNow() && !l.isHidden())){ c.table(Styles.grayPanel, b -> { 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(); } - }).growX().colspan(table.getColumns() - 2).row(); + }).growX().colspan(table.getColumns()).row(); }; }