From 6acf2bace1d66cb8b9e64ea5cbe501f3bbe8acb5 Mon Sep 17 00:00:00 2001 From: asdflj <854865755@qq.com> Date: Mon, 5 Dec 2022 10:57:27 +0800 Subject: [PATCH] uh --- .../com/glodblock/github/crossmod/waila/Tooltip.java | 11 ++++++----- .../crossmod/waila/part/SpeedWailaDataProvider.java | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/glodblock/github/crossmod/waila/Tooltip.java b/src/main/java/com/glodblock/github/crossmod/waila/Tooltip.java index e5b23016..2bbdc363 100644 --- a/src/main/java/com/glodblock/github/crossmod/waila/Tooltip.java +++ b/src/main/java/com/glodblock/github/crossmod/waila/Tooltip.java @@ -1,28 +1,29 @@ package com.glodblock.github.crossmod.waila; -import appeng.util.Utility; import com.glodblock.github.util.NameConst; import com.glodblock.github.util.Util; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraftforge.fluids.FluidStack; +import java.text.NumberFormat; + public class Tooltip { public static String fluidFormat(String name, int amount) { - return String.format("%s: %s mB", name, Utility.formatNumbers(amount)); + return String.format("%s: %s mB", name, NumberFormat.getInstance().format(amount)); } public static String partFluidBusFormat(int amount) { - return String.format("%s: %s mB/t", I18n.format(NameConst.WAILA_SPEED), Utility.formatNumbers(amount / 5)); + return String.format("%s: %s mB/t", I18n.format(NameConst.WAILA_SPEED), NumberFormat.getInstance().format(amount)); } public static String tileFluidInterfaceFormat(String name, int amount, int face) { - return String.format("%s %s: %s mB", I18n.format(NameConst.GUI_FLUID_INTERFACE + "." + face), name, Utility.formatNumbers(amount)); + return String.format("%s %s: %s mB", I18n.format(NameConst.GUI_FLUID_INTERFACE + "." + face), name, NumberFormat.getInstance().format(amount)); } public static String tileLevelMaintainerFormat(String name, long quantity, long batch, boolean isEnable) { return String.format("%s: %s / %s %s", - name, Utility.formatNumbers(quantity), Utility.formatNumbers(batch), + name, NumberFormat.getInstance().format(quantity), NumberFormat.getInstance().format(batch), isEnable ? I18n.format(NameConst.WAILA_ENABLE) : I18n.format(NameConst.WAILA_DISABLE) ); } diff --git a/src/main/java/com/glodblock/github/crossmod/waila/part/SpeedWailaDataProvider.java b/src/main/java/com/glodblock/github/crossmod/waila/part/SpeedWailaDataProvider.java index 329c8941..fad23841 100644 --- a/src/main/java/com/glodblock/github/crossmod/waila/part/SpeedWailaDataProvider.java +++ b/src/main/java/com/glodblock/github/crossmod/waila/part/SpeedWailaDataProvider.java @@ -23,7 +23,7 @@ public class SpeedWailaDataProvider extends BasePartWailaDataProvider { final IWailaConfigHandler config) { if (part instanceof PartSharedFluidBus) { part.readFromNBT(accessor.getNBTData()); - currentToolTip.add(Tooltip.partFluidBusFormat(((PartSharedFluidBus) part).calculateAmountToSend())); + currentToolTip.add(Tooltip.partFluidBusFormat(((PartSharedFluidBus) part).calculateAmountToSend() / 5)); } return currentToolTip; }