added text field horizontal scrolling + fixed int to text conversion

Author: XTerPL

src/main/java/io/github/techstreet/dfscript/screen/CScreen.java

@@ -65,13 +65,22 @@ public boolean charTyped(char ch, int keyCode) {
         return super.charTyped(ch, keyCode);
     }
 
+    @Override
     public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
         for (CWidget cWidget : widgets) {
             cWidget.keyPressed(keyCode, scanCode, modifiers);
         }
 
         return super.keyPressed(keyCode, scanCode, modifiers);
     }
+    @Override
+    public boolean keyReleased(int keyCode, int scanCode, int modifiers) {
+        for (CWidget cWidget : widgets) {
+            cWidget.keyReleased(keyCode, scanCode, modifiers);
+        }
+
+        return super.keyReleased(keyCode, scanCode, modifiers);
+    }
 
     @Override
     public boolean mouseClicked(double mouseX, double mouseY, int button) {

src/main/java/io/github/techstreet/dfscript/screen/script/ScriptEditActionScreen.java

@@ -11,6 +11,8 @@
 import io.github.techstreet.dfscript.script.argument.*;
 
 import java.awt.Rectangle;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
 import net.minecraft.client.gui.DrawableHelper;
@@ -41,7 +43,9 @@ public ScriptEditActionScreen(ScriptAction action, Script script) {
             } else if (arg instanceof ScriptNumberArgument na) {
                 icon = new ItemStack(Items.SLIME_BALL);
                 if (na.value() % 1 == 0) {
-                    text = String.valueOf((int) na.value());
+                    DecimalFormat df = new DecimalFormat("#");
+                    df.setRoundingMode(RoundingMode.UNNECESSARY);
+                    text = df.format(na.value());
                 } else {
                     text = String.valueOf(na.value());
                 }

src/main/java/io/github/techstreet/dfscript/screen/widget/CTextField.java

@@ -15,13 +15,16 @@ public class CTextField implements CWidget {
 
     boolean selected;
     boolean editable;
+
+    boolean xScrolling = false;
     public int textColor = 0xFFFFFFFF;
     String text;
     Runnable changedListener;
     int cursorPos = 0;
     boolean hasSelection = false;
     int selectionPos = 0;
     int scroll = 0;
+    int xScroll = 0;
 
     public CTextField(String text, int x, int y, int width, int height, boolean editable) {
         this.text = text;
@@ -63,7 +66,7 @@ public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
             (int) (end.getY() - begin.getY())*guiScale
         );
 
-        stack.translate(2, 2 + scroll, 0);
+        stack.translate(2 + xScroll, 2 + scroll, 0);
         stack.scale(0.5f, 0.5f, 0);
 
         TextRenderer f = DFScript.MC.textRenderer;
@@ -129,8 +132,15 @@ public void charTyped(char ch, int keyCode) {
         }
     }
 
+    public void keyReleased(int keyCode, int scanCode, int modifiers)
+    {
+        if(keyCode == 341) xScrolling = false; // left control
+    }
+
     @Override
     public void keyPressed(int keyCode, int scanCode, int modifiers) {
+        if(keyCode == 341) xScrolling = true; // left control
+
         if (editable && selected) {
             String lastText = text;
             TextRenderer f = DFScript.MC.textRenderer;
@@ -296,11 +306,35 @@ public boolean mouseClicked(double x, double y, int button) {
 
     @Override
     public void mouseScrolled(double mouseX, double mouseY, double amount) {
-        if (editable && selected) {
-            scroll += amount * 5;
-            TextRenderer f = DFScript.MC.textRenderer;
-            scroll = Math.min(0, Math.max(scroll, -(getLines().length + 1) * f.fontHeight / 2 + height - 2));
+        if (!editable || !selected) {
+            return;
         }
+
+        TextRenderer f = DFScript.MC.textRenderer;
+
+        if(xScrolling)
+        {
+            int maxScroll = 0;
+
+            for (String line : getLines()) {
+                int lineWidth = f.getWidth(line);
+
+                if(maxScroll < lineWidth) {
+                    maxScroll = lineWidth;
+                }
+            }
+
+            maxScroll /= 2;
+            maxScroll -= width - 2;
+
+            xScroll += amount * 5;
+            xScroll = Math.min(0, Math.max(xScroll, -maxScroll));
+
+            return;
+        }
+
+        scroll += amount * 5;
+        scroll = Math.min(0, Math.max(scroll, -(getLines().length + 1) * f.fontHeight / 2 + height - 2));
     }
 
     public int getCursorLineIndex() {

src/main/java/io/github/techstreet/dfscript/screen/widget/CWidget.java

@@ -17,6 +17,9 @@ default void charTyped(char ch, int keyCode) {
     default void keyPressed(int keyCode, int scanCode, int modifiers) {
     }
 
+    default void keyReleased(int keyCode, int scanCode, int modifiers) {
+    }
+
     default void mouseScrolled(double mouseX, double mouseY, double amount) {
     }
 

src/main/java/io/github/techstreet/dfscript/script/values/ScriptNumberValue.java

@@ -1,5 +1,8 @@
 package io.github.techstreet.dfscript.script.values;
 
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
+
 public class ScriptNumberValue extends ScriptValue {
 
     private final double value;
@@ -30,7 +33,9 @@ public boolean valueEquals(ScriptValue other) {
     @Override
     public String asText() {
         if (value % 1 == 0) {
-            return String.valueOf((int) value);
+            DecimalFormat df = new DecimalFormat("#");
+            df.setRoundingMode(RoundingMode.UNNECESSARY);
+            return df.format(value);
         }
         return String.valueOf(value);
     }