Skip to content

Input validation improvement #806

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 1 commit into from
Jan 4, 2026
Merged

Input validation improvement #806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions src/main/java/com/ldtteam/structurize/client/gui/WindowReplaceBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.ldtteam.structurize.Network;
import com.ldtteam.structurize.api.util.ItemStackUtils;
import com.ldtteam.structurize.blocks.ModBlocks;
import com.ldtteam.structurize.client.gui.util.InputFilters;
import com.ldtteam.structurize.client.gui.util.ItemPositionsStorage;
import com.ldtteam.structurize.client.gui.util.ItemUtil;
import com.ldtteam.structurize.network.messages.ReplaceBlockMessage;
Expand Down Expand Up @@ -51,6 +52,7 @@ public WindowReplaceBlock(
Component.translatable("com.ldtteam.structurize.gui.scan.replace.pct"));
this.toReplace = toReplace;
findPaneOfTypeByID("count", TextField.class).setText("100");
findPaneOfTypeByID(COUNT, TextField.class).setFilter(InputFilters.PERCENT);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/ldtteam/structurize/client/gui/WindowSelectRes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ public WindowSelectRes(
if (this.selectCountText != null)
{
countField.setVisible(true);
countField.setFilter(InputFilters.ONLY_POSITIVE_NUMBERS);
countField.setFilter(InputFilters.ONLY_POSITIVE_NUMBERS_MAX1k);
countText.setVisible(true);
countText.setText(selectCountText);
}
Expand Down
40 changes: 38 additions & 2 deletions src/main/java/com/ldtteam/structurize/client/gui/util/InputFilters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public boolean isAllowedCharacter(final char c)
}
};

public static TextField.Filter ONLY_POSITIVE_NUMBERS = new TextField.Filter()
public static TextField.Filter ONLY_POSITIVE_NUMBERS_MAX1k = new TextField.Filter()
{
@Override
public String filter(final String s)
Expand All @@ -29,7 +29,12 @@ public String filter(final String s)
int i = Integer.parseInt(s);
if (i > 0)
{
return s;
if (i > 999)
{
i = 999;
}

return String.valueOf(i);
}
}
catch (Exception ignored)
Expand All @@ -44,4 +49,35 @@ public boolean isAllowedCharacter(final char c)
return Character.isDigit(c);
}
};

public static TextField.Filter PERCENT = new TextField.Filter()
{
@Override
public String filter(final String s)
{
try
{
int i = Integer.parseInt(s);
if (i >= 0)
{
if (i > 100)
{
i = 100;
}

return String.valueOf(i);
}
}
catch (Exception ignored)
{
}
return "0";
}

@Override
public boolean isAllowedCharacter(final char c)
{
return Character.isDigit(c);
}
};
}