Skip to content

Fix text filtering #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
someaddons merged 2 commits into from
Dec 28, 2025
Merged

Fix text filtering #122

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
844e558
Fix filter not testing the whole string
someaddons Dec 26, 2025
b5e5f32
Improve text input filtering
someaddons Dec 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 38 additions & 45 deletions src/main/java/com/ldtteam/blockui/controls/TextField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,20 @@
import com.ldtteam.blockui.BOGuiGraphics;
import com.ldtteam.blockui.Pane;
import com.ldtteam.blockui.PaneParams;
import com.ldtteam.blockui.mod.Log;
import com.ldtteam.blockui.util.cursor.Cursor;
import com.ldtteam.blockui.views.View;
import com.mojang.blaze3d.vertex.*;
import org.joml.Matrix4f;
import com.mojang.blaze3d.platform.GlStateManager.LogicOp;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.BufferBuilder;
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
import com.mojang.blaze3d.vertex.Tesselator;
import com.mojang.blaze3d.vertex.VertexFormat;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.util.Mth;
import org.jetbrains.annotations.Nullable;
import org.joml.Matrix4f;
import org.lwjgl.glfw.GLFW;

/**
Expand All @@ -22,22 +26,22 @@ public class TextField extends Pane
{
protected InputHandler handler;

private static final int RECT_COLOR = -3_092_272;
private static final int DEFAULT_MAX_TEXT_LENGTH = 32;
private static final int RECT_COLOR = -3_092_272;
private static final int DEFAULT_MAX_TEXT_LENGTH = 32;
// Attributes
protected int maxTextLength = DEFAULT_MAX_TEXT_LENGTH;
protected int textColor = 0xE0E0E0;
protected int textColorDisabled = 0x707070;
protected boolean shadow = true;
protected int maxTextLength = DEFAULT_MAX_TEXT_LENGTH;
protected int textColor = 0xE0E0E0;
protected int textColorDisabled = 0x707070;
protected boolean shadow = true;
@Nullable
protected String tabNextPaneID = null;
protected String tabNextPaneID = null;
// Runtime
protected String text = "";
protected Filter filter;
protected int cursorPosition = 0;
protected int scrollOffset = 0;
protected int selectionEnd = 0;
protected int cursorBlinkCounter = 0;
protected String text = "";
protected Filter filter;
protected int cursorPosition = 0;
protected int scrollOffset = 0;
protected int selectionEnd = 0;
protected int cursorBlinkCounter = 0;

/**
* Simple public constructor to instantiate.
Expand Down Expand Up @@ -198,7 +202,7 @@ else if (selectionEnd <= scrollOffset)
}
}

public String getSelectedText()
public String getSelectedText()
{
final int start = Math.min(cursorPosition, selectionEnd);
final int end = Math.max(cursorPosition, selectionEnd);
Expand Down Expand Up @@ -494,11 +498,20 @@ public void onUpdate()
/**
* Write text into the field.
*
* @param str the string to write.
* @param input the string to write.
*/
public void writeText(final String str)
public void writeText(String input)
{
final String filteredStr = filter.filter(str);
final char[] chars = input.toCharArray();
final StringBuilder strBuilder = new StringBuilder();
for (final char aChar : chars)
{
if (filter.isAllowedCharacter(aChar))
{
strBuilder.append(aChar);
}
}
input = strBuilder.toString();

final int insertAt = Math.min(cursorPosition, selectionEnd);
final int insertEnd = Math.max(cursorPosition, selectionEnd);
Expand All @@ -509,30 +522,10 @@ public void writeText(final String str)
return;
}

final StringBuilder resultBuffer = new StringBuilder();
if (text.length() > 0 && insertAt > 0)
{
resultBuffer.append(text.substring(0, insertAt));
}

final int insertedLength;
if (availableChars < filteredStr.length())
{
resultBuffer.append(filteredStr.substring(0, availableChars));
insertedLength = availableChars;
}
else
{
resultBuffer.append(filteredStr);
insertedLength = filteredStr.length();
}

if (text.length() > 0 && insertEnd < text.length())
{
resultBuffer.append(text.substring(insertEnd));
}

text = resultBuffer.toString();
String filteredText = filter.filter(text.substring(0, insertAt) + input + text.substring(insertEnd));
filteredText = (filteredText.substring(0, Math.min(filteredText.length(), maxTextLength)));
final int insertedLength = filteredText.length() - text.length();
text = filteredText;
moveCursorBy((insertAt - selectionEnd) + insertedLength);

triggerHandler();
Expand Down Expand Up @@ -604,7 +597,7 @@ public void deleteFromCursor(final int count)
final boolean backwards = count < 0;
final int start = backwards ? (this.cursorPosition + count) : this.cursorPosition;
final int end = backwards ? this.cursorPosition : (this.cursorPosition + count);
String result = "";
String result = "";

if (start > 0)
{
Expand All @@ -616,7 +609,7 @@ public void deleteFromCursor(final int count)
result = result + text.substring(end);
}

text = result;
text = filter.filter(result);

if (backwards)
{
Expand Down