From 5a5854420ecb1a686d0160f9ef89668fef1da258 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 1 Apr 2021 09:27:36 -0400 Subject: [PATCH] Long support for UI.formatAmount --- core/src/mindustry/core/UI.java | 6 +++--- core/src/mindustry/world/blocks/power/PowerNode.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java index 7738da6706..279427f6f4 100644 --- a/core/src/mindustry/core/UI.java +++ b/core/src/mindustry/core/UI.java @@ -535,11 +535,11 @@ public class UI implements ApplicationListener, Loadable{ dialog.show(); } - public static String formatAmount(int number){ + public static String formatAmount(long number){ //prevent overflow - if(number == Integer.MIN_VALUE) number ++; + if(number == Long.MIN_VALUE) number ++; - int mag = Math.abs(number); + long mag = Math.abs(number); String sign = number < 0 ? "-" : ""; if(mag >= 1_000_000_000){ return sign + Strings.fixed(mag / 1_000_000_000f, 1) + "[gray]" + Core.bundle.get("unit.billions") + "[]"; diff --git a/core/src/mindustry/world/blocks/power/PowerNode.java b/core/src/mindustry/world/blocks/power/PowerNode.java index 58c59861fc..313d995340 100644 --- a/core/src/mindustry/world/blocks/power/PowerNode.java +++ b/core/src/mindustry/world/blocks/power/PowerNode.java @@ -108,13 +108,13 @@ public class PowerNode extends PowerBlock{ super.setBars(); bars.add("power", entity -> new Bar(() -> Core.bundle.format("bar.powerbalance", - ((entity.power.graph.getPowerBalance() >= 0 ? "+" : "") + UI.formatAmount((int)(entity.power.graph.getPowerBalance() * 60)))), + ((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((int)entity.power.graph.getLastPowerStored())), UI.formatAmount((int)entity.power.graph.getLastCapacity())), + (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())));