fix e notation formatting on power milestone

GTNewHorizons · Sep 30, 2024 · 36296a0 · 36296a0
1 parent 88d8155
commit 36296a0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEForgeOfGods.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEForgeOfGods.java
@@ -1392,7 +1392,7 @@ protected ModularWindow createIndividualMilestoneWindow(final EntityPlayer playe
                     .setPos(5, 50)
                     .setSize(140, 30))
             .widget(
-                TextWidget.dynamicText(() -> milestoneProgressText(currentMilestoneID, true))
+                TextWidget.dynamicText(() -> milestoneProgressText(currentMilestoneID))
                     .setScale(0.7f)
                     .setDefaultColor(EnumChatFormatting.WHITE)
                     .setSize(140, 30)
@@ -2692,7 +2692,7 @@ protected ModularWindow createSpecialThanksWindow(final EntityPlayer player) {
                         .setSize(60, 10))
             .widget(
                 new TextWidget(
-                    translateToLocal("gt.blockmachines.multimachine.FOG.serenybiss") + " "
+                    translateToLocal("gt.blockmachines.multimachine.FOG.serenibyss") + " "
                         + EnumChatFormatting.DARK_AQUA
                         + translateToLocal("gt.blockmachines.multimachine.FOG.teg")).setScale(0.8f)
                             .setTextAlignment(Alignment.CenterLeft)
@@ -3502,14 +3502,13 @@ private Text currentMilestone(int milestoneID) {
                 + milestoneProgress[milestoneID]);
     }
 
-    private Text milestoneProgressText(int milestoneID, boolean formatting) {
+    private Text milestoneProgressText(int milestoneID) {
         long max;
         BigInteger bigMax;
         String suffix;
         String progressText = translateToLocal("gt.blockmachines.multimachine.FOG.progress");
         Text done = new Text(translateToLocal("gt.blockmachines.multimachine.FOG.milestonecomplete"));
         if (noFormatting) {
-            formatting = false;
             done = new Text(
                 translateToLocal("gt.blockmachines.multimachine.FOG.milestonecomplete") + EnumChatFormatting.DARK_RED
                     + "?");
@@ -3524,7 +3523,7 @@ private Text milestoneProgressText(int milestoneID, boolean formatting) {
                         bigMax = BigInteger.valueOf(LongMath.pow(9, milestoneProgress[0]))
                             .multiply(BigInteger.valueOf(LongMath.pow(10, 15)));
                     }
-                    if (formatting && (totalPowerConsumed.compareTo(BigInteger.valueOf(1_000L)) > 0)) {
+                    if (!noFormatting && (bigMax.compareTo(BigInteger.valueOf(1_000L)) > 0)) {
                         return new Text(
                             progressText + ": " + EnumChatFormatting.GRAY + toExponentForm(bigMax) + " " + suffix);
                     } else {
@@ -3568,7 +3567,7 @@ private Text milestoneProgressText(int milestoneID, boolean formatting) {
             default:
                 return new Text("Error");
         }
-        if (formatting) {
+        if (!noFormatting) {
             return new Text(progressText + ": " + EnumChatFormatting.GRAY + formatNumbers(max) + " " + suffix);
         } else {
             return new Text(progressText + ": " + EnumChatFormatting.GRAY + max + " " + suffix);

diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang
@@ -1120,7 +1120,7 @@ gt.blockmachines.multimachine.FOG.lead=Project Lead
 gt.blockmachines.multimachine.FOG.cloud=GDCloud
 gt.blockmachines.multimachine.FOG.programming=Programming
 gt.blockmachines.multimachine.FOG.teg=TheEpicGamer
-gt.blockmachines.multimachine.FOG.serenybiss=§dSereni§5byss
+gt.blockmachines.multimachine.FOG.serenibyss=§dSereni§5byss
 gt.blockmachines.multimachine.FOG.textures=Textures & Structure
 gt.blockmachines.multimachine.FOG.ant=Ant
 gt.blockmachines.multimachine.FOG.lore=Loremaster