diff options
| author | Glease <4586901+Glease@users.noreply.github.com> | 2022-12-20 01:07:55 +0800 |
|---|---|---|
| committer | Glease <4586901+Glease@users.noreply.github.com> | 2022-12-20 22:24:48 +0800 |
| commit | 789dfab72d154b4822fcc2374e1ceb90a03af601 (patch) | |
| tree | a4d994de3b2945eff87ff8dcfcf1acad395b9eac /src/main | |
| parent | c041ee228e321ffd017b57fa789cb5c03709bc3b (diff) | |
| download | GT5-Unofficial-789dfab72d154b4822fcc2374e1ceb90a03af601.tar.gz GT5-Unofficial-789dfab72d154b4822fcc2374e1ceb90a03af601.tar.bz2 GT5-Unofficial-789dfab72d154b4822fcc2374e1ceb90a03af601.zip | |
make waila display more intuitive
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/net/glease/ggfab/mte/MTE_AdvAssLine.java | 13 | ||||
| -rw-r--r-- | src/main/resources/assets/ggfab/lang/en_US.lang | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/main/java/net/glease/ggfab/mte/MTE_AdvAssLine.java b/src/main/java/net/glease/ggfab/mte/MTE_AdvAssLine.java index c2233dae40..f3389d9d51 100644 --- a/src/main/java/net/glease/ggfab/mte/MTE_AdvAssLine.java +++ b/src/main/java/net/glease/ggfab/mte/MTE_AdvAssLine.java @@ -702,14 +702,15 @@ public class MTE_AdvAssLine extends GT_MetaTileEntity_ExtendedPowerMultiBlockBas for (int i = 0, listSize = list.size(); i < listSize; i++) { NBTTagInt t = list.get(i); int progress = t.func_150287_d(); - if (progress > 20) { - currentTip.add(I18n.format("ggfab.waila.advassline.slice", i + 1, progress / 20, duration / 20)); - } else if (progress > 0) { - currentTip.add(I18n.format("ggfab.waila.advassline.slice.small", i + 1, progress)); - } else if (progress == 0) { + if (progress == 0) { currentTip.add(I18n.format("ggfab.waila.advassline.slice.stuck", i + 1)); - } else + } else if (progress < 0) { currentTip.add(I18n.format("ggfab.waila.advassline.slice.idle", i + 1)); + } else if (duration > 20) { + currentTip.add(I18n.format("ggfab.waila.advassline.slice", i + 1, (duration - progress) / 20, duration / 20)); + } else { + currentTip.add(I18n.format("ggfab.waila.advassline.slice.small", i + 1, progress)); + } } } } diff --git a/src/main/resources/assets/ggfab/lang/en_US.lang b/src/main/resources/assets/ggfab/lang/en_US.lang index 6cce1916bd..37cd64a613 100644 --- a/src/main/resources/assets/ggfab/lang/en_US.lang +++ b/src/main/resources/assets/ggfab/lang/en_US.lang @@ -7,7 +7,7 @@ ggfab.info.advassline.5=The terminal slice (the n-th slice, where n is number of ggfab.info.advassline.6=The EU/t cost of this machine is number of slices active multiplied by the original recipe EU/t. §4STUCK§r slices do not consume power. It will use the worst energy supplying hatch's input voltage for recipe tier calculation and normal imperfect overclock. ggfab.info.advassline.7=With exotic energy hatches, it can overclock beyond usual voltage tier, but will consume even more power than usual imperfect overclock. Every §2laser overclock§r will add 0.5 to power exponent. ggfab.info.advassline.8=1 §2laser overclock§r will have 50% recipe time and use 430% power. 2 §2laser overclock§r will have 25% recipe time and use 1978% (4.3*4.6) power. Will not overclock beyond 1 tick. Machine first tries to parallelize, then normal imperfect overclock, then §2laser overclock§r. -ggfab.waila.advassline.slice=Slice #%s: %s s/%s s +ggfab.waila.advassline.slice=Slice #%s: %s s / %s s ggfab.waila.advassline.slice.small=Slice #%s: %s ticks remaining ggfab.waila.advassline.slice.idle=Slice #%s: Idle ggfab.waila.advassline.slice.stuck=Slice #%s: §4STUCK |