Add experimental IntegerFieldWidget

Author: YannickMG

src/main/java/com/cleanroommc/modularui/test/TestTile.java

@@ -28,6 +28,7 @@
 import com.cleanroommc.modularui.widgets.layout.Flow;
 import com.cleanroommc.modularui.widgets.layout.Row;
 import com.cleanroommc.modularui.widgets.slot.*;
+import com.cleanroommc.modularui.widgets.textfield.IntegerFieldWidget;
 import com.cleanroommc.modularui.widgets.textfield.TextFieldWidget;
 
 import net.minecraft.init.Blocks;
@@ -53,6 +54,7 @@ public class TestTile extends TileEntity implements IGuiHolder<PosGuiData>, ITic
     private long time = 0;
     private int val, val2 = 0;
     private String value = "";
+    private int intValue = 1234567;
     private double doubleValue = 1;
     private final int duration = 80;
     private int progress = 0;
@@ -221,8 +223,16 @@ public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager,
                                                                 .child(new FluidSlot()
                                                                         .margin(2)
                                                                         .width(30)
-                                                                        .syncHandler(SyncHandlers.fluidSlot(this.fluidTankPhantom).phantom(true)))
-                                                        )))
+                                                                        .syncHandler(SyncHandlers.fluidSlot(this.fluidTankPhantom).phantom(true))))
+                                                        .child(new Column()
+                                                                .debugName("button and slots test 3")
+                                                                .coverChildren()
+                                                                .alignY(Alignment.START)
+                                                                .child(new IntegerFieldWidget()
+                                                                        .size(60, 20)
+                                                                        .value(SyncHandlers.intNumber(() -> this.intValue, val -> this.intValue = val))
+                                                                        .setNumbers(0, 9999999)
+                                                                        .hintText("integer")))))
                                         .addPage(new Column()
                                                         .debugName("Slots test page")
                                                         .coverChildren()

src/main/java/com/cleanroommc/modularui/widgets/textfield/BaseTextFieldWidget.java

@@ -16,6 +16,7 @@
 
 import net.minecraft.client.gui.GuiScreen;
 
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.input.Keyboard;
 
@@ -44,7 +45,7 @@ public class BaseTextFieldWidget<W extends BaseTextFieldWidget<W>> extends Abstr
     private static final int CURSOR_BLINK_RATE = 10;
 
     protected TextFieldHandler handler = new TextFieldHandler(this);
-    protected TextFieldRenderer renderer = new TextFieldRenderer(this.handler);
+    protected final TextFieldRenderer renderer;
     protected Alignment textAlignment = Alignment.CenterLeft;
     protected List<String> lastText;
     protected int scrollOffset = 0;
@@ -59,11 +60,17 @@ public class BaseTextFieldWidget<W extends BaseTextFieldWidget<W>> extends Abstr
 
     public BaseTextFieldWidget() {
         super(new HorizontalScrollData(), null);
+        this.renderer = initializeTextFieldRenderer();
         this.handler.setRenderer(this.renderer);
         this.handler.setScrollArea(getScrollArea());
         padding(4, 0);
     }
 
+    @ApiStatus.Experimental
+    protected TextFieldRenderer initializeTextFieldRenderer() {
+        return new TextFieldRenderer(this.handler);
+    }
+
     @Override
     public @NotNull List<IWidget> getChildren() {
         return Collections.emptyList();

src/main/java/com/cleanroommc/modularui/widgets/textfield/IntegerFieldRenderer.java

@@ -0,0 +1,41 @@
+package com.cleanroommc.modularui.widgets.textfield;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.text.DecimalFormat;
+import java.util.List;
+import java.util.stream.Collectors;
+
+class IntegerFieldRenderer extends TextFieldRenderer {
+    private static final DecimalFormat INTEGER_FIELD_FORMAT = new DecimalFormat("#");
+
+    static {
+        INTEGER_FIELD_FORMAT.setGroupingUsed(true);
+        INTEGER_FIELD_FORMAT.setGroupingSize(3);
+    }
+
+    public IntegerFieldRenderer(TextFieldHandler handler) {
+        super(handler);
+    }
+
+    @Override
+    public void draw(List<String> lines) {
+        super.draw(lines.stream().map(IntegerFieldRenderer::tryFormatString)
+                .collect(Collectors.toList()));
+    }
+
+    private static @NotNull String tryFormatString(String str) {
+        try {
+            return INTEGER_FIELD_FORMAT.format(Long.parseLong(str));
+        } catch (NumberFormatException e) {
+            return str;
+        }
+    }
+
+    @Override
+    protected boolean isIgnoredChar(char c) {
+        return c == INTEGER_FIELD_FORMAT.getDecimalFormatSymbols().getGroupingSeparator();
+    }
+
+
+}

src/main/java/com/cleanroommc/modularui/widgets/textfield/IntegerFieldWidget.java

@@ -0,0 +1,15 @@
+package com.cleanroommc.modularui.widgets.textfield;
+
+import org.jetbrains.annotations.ApiStatus;
+
+/**
+ * This widget formats integers with group separators.
+ */
+@ApiStatus.Experimental
+public class IntegerFieldWidget extends TextFieldWidget {
+
+    @Override
+    protected TextFieldRenderer initializeTextFieldRenderer() {
+        return new IntegerFieldRenderer(this.handler);
+    }
+}

src/main/java/com/cleanroommc/modularui/widgets/textfield/TextFieldRenderer.java

@@ -10,6 +10,9 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+
 import java.awt.*;
 import java.awt.geom.Point2D;
 import java.util.Collections;
@@ -107,28 +110,56 @@ public Point getCursorPos(List<String> lines, int x, int y) {
         if (line.getWidth() <= 0) return new Point(0, index);
         if (line.getWidth() < x) return new Point(line.getText().length(), index);
         float currentX = 0;
+        int ignoredChars = 0;
         for (int i = 0; i < line.getText().length(); i++) {
             char c = line.getText().charAt(i);
             float charWidth = getFontRenderer().getCharWidth(c) * this.scale;
             currentX += charWidth;
+            if (isIgnoredChar(c)) ignoredChars++;
             if (currentX >= x) {
                 // dist with current letter < dist without current letter -> next letter pos
                 if (Math.abs(currentX - x) < Math.abs(currentX - charWidth - x)) i++;
-                return new Point(i, index);
+                return new Point(i - ignoredChars, index);
             }
         }
         return new Point();
     }
 
+    /**
+     * Whether the given character should be ignored for cursor positioning purposes
+     */
+    @ApiStatus.Experimental
+    protected boolean isIgnoredChar(char c) {
+        return false;
+    }
+
     public Point2D.Float getPosOf(List<Line> measuredLines, Point cursorPos) {
         if (measuredLines.isEmpty()) {
             return new Point2D.Float(getStartX(0), getStartYOfLines(1));
         }
         Line line = measuredLines.get(cursorPos.y);
-        String sub = line.getText().substring(0, Math.min(line.getText().length(), cursorPos.x));
+        String sub = getStringBeforeCursor(line, cursorPos);
         return new Point2D.Float(getStartX(line.getWidth()) + getFontRenderer().getStringWidth(sub) * this.scale, getStartYOfLines(measuredLines.size()) + cursorPos.y * getFontHeight());
     }
 
+    private @NotNull String getStringBeforeCursor(Line line, Point cursorPos) {
+        String text = line.getText();
+        String sub = text.substring(0, Math.min(text.length(), cursorPos.x));
+        int i = 0;
+        int ignoredChars = 0;
+        while (i < sub.length() && i + ignoredChars < text.length()) {
+            if (isIgnoredChar(text.charAt(i + ignoredChars))) {
+                ignoredChars++;
+            } else {
+                i++;
+            }
+        }
+        if (ignoredChars > 0)         {
+            sub = sub + text.substring(sub.length(), Math.min(text.length(), cursorPos.x + ignoredChars));
+        }
+        return sub;
+    }
+
     @SideOnly(Side.CLIENT)
     public void drawMarked(float y0, float x0, float x1) {
         y0 -= 1;