diff --git a/core/assets-raw/sprites/blocks/power/beam-node.png b/core/assets-raw/sprites/blocks/power/beam-node.png index 0941fd74dd..9df504d257 100644 Binary files a/core/assets-raw/sprites/blocks/power/beam-node.png and b/core/assets-raw/sprites/blocks/power/beam-node.png differ diff --git a/core/src/mindustry/world/blocks/power/BeamNode.java b/core/src/mindustry/world/blocks/power/BeamNode.java index 32f5461556..528e146472 100644 --- a/core/src/mindustry/world/blocks/power/BeamNode.java +++ b/core/src/mindustry/world/blocks/power/BeamNode.java @@ -36,6 +36,14 @@ public class BeamNode extends PowerBlock{ envEnabled |= Env.space; } + @Override + public void setBars(){ + super.setBars(); + + bars.add("power", PowerNode.makePowerBalance()); + bars.add("batteries", PowerNode.makeBatteryBalance()); + } + @Override public void init(){ super.init(); diff --git a/core/src/mindustry/world/blocks/power/PowerNode.java b/core/src/mindustry/world/blocks/power/PowerNode.java index cbd378284b..4e5a5c1598 100644 --- a/core/src/mindustry/world/blocks/power/PowerNode.java +++ b/core/src/mindustry/world/blocks/power/PowerNode.java @@ -100,19 +100,8 @@ public class PowerNode extends PowerBlock{ @Override public void setBars(){ super.setBars(); - bars.add("power", entity -> new Bar(() -> - Core.bundle.format("bar.powerbalance", - ((entity.power.graph.getPowerBalance() >= 0 ? "+" : "") + UI.formatAmount((long)(entity.power.graph.getPowerBalance() * 60)))), - () -> Pal.powerBar, - () -> Mathf.clamp(entity.power.graph.getLastPowerProduced() / entity.power.graph.getLastPowerNeeded()) - )); - - bars.add("batteries", entity -> new Bar(() -> - Core.bundle.format("bar.powerstored", - (UI.formatAmount((long)entity.power.graph.getLastPowerStored())), UI.formatAmount((long)entity.power.graph.getLastCapacity())), - () -> Pal.powerBar, - () -> Mathf.clamp(entity.power.graph.getLastPowerStored() / entity.power.graph.getLastCapacity()) - )); + bars.add("power", makePowerBalance()); + bars.add("batteries", makeBatteryBalance()); bars.add("connections", entity -> new Bar(() -> Core.bundle.format("bar.powerlines", entity.power.links.size, maxNodes), @@ -121,6 +110,24 @@ public class PowerNode extends PowerBlock{ )); } + public static Func makePowerBalance(){ + return entity -> new Bar(() -> + Core.bundle.format("bar.powerbalance", + ((entity.power.graph.getPowerBalance() >= 0 ? "+" : "") + UI.formatAmount((long)(entity.power.graph.getPowerBalance() * 60)))), + () -> Pal.powerBar, + () -> Mathf.clamp(entity.power.graph.getLastPowerProduced() / entity.power.graph.getLastPowerNeeded()) + ); + } + + public static Func makeBatteryBalance(){ + return entity -> new Bar(() -> + Core.bundle.format("bar.powerstored", + (UI.formatAmount((long)entity.power.graph.getLastPowerStored())), UI.formatAmount((long)entity.power.graph.getLastCapacity())), + () -> Pal.powerBar, + () -> Mathf.clamp(entity.power.graph.getLastPowerStored() / entity.power.graph.getLastCapacity()) + ); + } + @Override public void setStats(){ super.setStats();