[F] PBar: Fix progress row formatting logic

Author: hykilpikonna

src/main/java/org/hydev/mcpm/client/interaction/ProgressBarTheme.java

@@ -12,14 +12,16 @@
  * @since 2022-09-27
  */
 public record ProgressBarTheme(
-    String ipr,
     String done,
-    int iprLen,
-    int doneLen
+    String ipr,
+    String prefix,
+    String suffix,
+    int doneLen,
+    int iprLen
 )
 {
-    public static final ProgressBarTheme ASCII_THEME = new ProgressBarTheme("#", "-", 1, 1);
-    public static final ProgressBarTheme CLASSIC_THEME = new ProgressBarTheme("█", ".", 1, 1);
-    public static final ProgressBarTheme EMOJI_THEME = new ProgressBarTheme("✅", "🕑", 2, 2);
-    public static final ProgressBarTheme FLOWER_THEME = new ProgressBarTheme("🌸", "🥀", 2, 2);
+    public static final ProgressBarTheme ASCII_THEME = new ProgressBarTheme("#", "-", "[", "]", 1, 1);
+    public static final ProgressBarTheme CLASSIC_THEME = new ProgressBarTheme("█", ".", "", "", 1, 1);
+    public static final ProgressBarTheme EMOJI_THEME = new ProgressBarTheme("✅", "🕑", "", "", 2, 2);
+    public static final ProgressBarTheme FLOWER_THEME = new ProgressBarTheme("🌸", "🥀", "", "", 2, 2);
 }

src/main/java/org/hydev/mcpm/client/interaction/ProgressRow.java

@@ -30,20 +30,21 @@ public ProgressRow(long total)
      * Get formatted string of the current progress bar
      *
      * @param theme Progress bar theme
+     * @param cols Number of columns (width) of the terminal window
      * @return Formatted string
      */
-    public String fmt(ProgressBarTheme theme)
+    public String fmt(ProgressBarTheme theme, int cols)
     {
         double p = 100d * completed / total;
         var placeholder = "PLACEHOLDER_BAR";
         var t = format("%s%s%s %.0f %d/%d%s", theme.prefix(), placeholder, theme.suffix(), p, completed, total, unit);
 
         // Add progress bar length
-        var len = t.length() - placeholder.length();
+        var len = cols - t.length() + placeholder.length();
 
         // Calculate progress length
-        int pLen = (int) (completed / total * len);
-        var bar = theme.done().repeat(pLen / theme.doneLen()) + theme.ipr().repeat(pLen / theme.iprLen());
+        int pLen = (int) (1d * completed / total * len);
+        var bar = theme.done().repeat(pLen / theme.doneLen()) + theme.ipr().repeat((len - pLen) / theme.iprLen());
 
         return t.replaceFirst(placeholder, bar);
     }