Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Comma-tize the TOP/WAILA/HWYLA energy container display #2597

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Comma-tize the TOP/WAILA/HWYLA energy container display #2597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
961f354
Comma-tize the EU storage in TOP
Zorbatron Aug 22, 2024
614de93
Missing space
Zorbatron Aug 22, 2024
c50ab55
Change WAILA/HWYLA too
Zorbatron Aug 22, 2024
9dc4535
Spotless
Zorbatron Aug 22, 2024
2ec8127
Use TextFormattingUtil.formatNumbers instead of String.format
Zorbatron Aug 22, 2024
ab8ca97
Change the other langs string formatting to match en_us
Zorbatron Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/main/java/gregtech/integration/hwyla/provider/ElectricContainerDataProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import gregtech.api.GTValues;
import gregtech.api.capability.GregtechCapabilities;
import gregtech.api.capability.IEnergyContainer;
import gregtech.api.util.TextFormattingUtil;

import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
Expand Down Expand Up @@ -59,7 +60,9 @@ public List<String> getWailaBody(ItemStack itemStack, List<String> tooltip, IWai
NBTTagCompound energyTag = accessor.getNBTData().getCompoundTag("gregtech.IEnergyContainer");
long stored = energyTag.getLong("Stored");
long capacity = energyTag.getLong("Capacity");
tooltip.add(I18n.format("gregtech.waila.energy_stored", stored, capacity));
tooltip.add(I18n.format("gregtech.waila.energy_stored",
TextFormattingUtil.formatNumbers(stored),
TextFormattingUtil.formatNumbers(capacity)));
}
return tooltip;
}
Expand Down
7 changes: 5 additions & 2 deletions src/main/java/gregtech/integration/theoneprobe/provider/ElectricContainerInfoProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,11 @@ protected void addProbeInfo(@NotNull IEnergyContainer capability, @NotNull IProb
long stored = capability.getEnergyStored();
if (maxStorage == 0) return; // do not add empty max storage progress bar
probeInfo.progress(capability.getEnergyStored(), maxStorage, probeInfo.defaultProgressStyle()
.numberFormat(player.isSneaking() || stored < 10000 ? NumberFormat.FULL : NumberFormat.COMPACT)
.suffix(" / " + (player.isSneaking() || maxStorage < 10000 ? maxStorage + " EU" :
.numberFormat(player.isSneaking() || stored < 10000 ?
NumberFormat.COMMAS :
NumberFormat.COMPACT)
.suffix(" / " + (player.isSneaking() || maxStorage < 10000 ?
ElementProgress.format(maxStorage, NumberFormat.COMMAS, " EU") :
ElementProgress.format(maxStorage, NumberFormat.COMPACT, "EU")))
.filledColor(0xFFEEE600)
.alternateFilledColor(0xFFEEE600)
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/gregtech/lang/en_us.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ option.gregtech.steam_boiler=Steam Boilers
option.gregtech.transformer=Transformers
option.gregtech.workable=Workable Machines

gregtech.waila.energy_stored=Energy: %d EU / %d EU
gregtech.waila.energy_stored=Energy: %s EU / %s EU
gregtech.waila.progress_idle=Idle
gregtech.waila.progress_tick=Progress: %d t / %d t
gregtech.waila.progress_sec=Progress: %d s / %d s
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/gregtech/lang/ja_jp.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ gregtech.top.ld_pipe_output=搬出
gregtech.top.ld_pipe_input_endpoint=搬入口:
gregtech.top.ld_pipe_output_endpoint=搬出口:

gregtech.waila.energy_stored=エネルギー: %d EU / %d EU
gregtech.waila.energy_stored=エネルギー: %s EU / %s EU
gregtech.waila.progress_idle=停止中
gregtech.waila.progress_tick=進捗: %d t / %d t
gregtech.waila.progress_sec=進捗: %d s / %d s
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/gregtech/lang/ru_ru.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ gregtech.top.ld_pipe_input=Ввод
gregtech.top.ld_pipe_output=Вывод
gregtech.top.ld_pipe_input_endpoint=Входная конечная точка:
gregtech.top.ld_pipe_output_endpoint=Выходная конечная точка:
gregtech.waila.energy_stored=Энергия: %d EU / %d EU
gregtech.waila.energy_stored=Энергия: %s EU / %s EU
gregtech.waila.progress_idle=Простой
gregtech.waila.progress_tick=Прогресс: %d t / %d t
gregtech.waila.progress_sec=Прогресс: %d s / %d s
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/gregtech/lang/zh_cn.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ option.gregtech.steam_boiler=蒸汽锅炉
option.gregtech.transformer=变压器
option.gregtech.workable=机器工作状态

gregtech.waila.energy_stored=能量：%d EU / %d EU
gregtech.waila.energy_stored=能量：%s EU / %s EU
gregtech.waila.progress_idle=闲置
gregtech.waila.progress_tick=进度：%d t / %d t
gregtech.waila.progress_sec=进度：%d s / %d s
Expand Down