Allow nullable patterns with different modifier orders.

[Moderocky]

Description

SkriptParser checked for nullable/default inputs to start with -, which would fail if the input was something like %~-objects% (since it starts with ~, not -).

I delegated it to a method that checks the first n = min(length, 5) characters of the string for the - and fails if one isn't present, or the text of the input (like objects) starts before the - is found.

Obviously, if we add a hundred new %!?^&*$-~+objects modifiers in future this limit will need to be increased, but I kept it low for safety in case of some unusual (addon) pattern.

---

Target Minecraft Versions: any
Requirements: none
Related Issues: closes #6202

[APickledWalrus]

I think we could come up with a better solution. Perhaps we could find a way to integrate TypePatternElement here and do away with this string loops that searches for expressions:

Skript/src/main/java/ch/njol/skript/patterns/TypePatternElement.java

Line 267 in 4d40944

private ExprInfo getExprInfo() {

If we don't wish to change that much at this time, we should at least just call getExprInfo earlier and check exprInfo.isOptional (less changes, but arguably a worse solution)

[sovdeeth]

I think we could come up with a better solution. Perhaps we could find a way to integrate TypePatternElement here and do away with this string loops that searches for expressions:

Skript/src/main/java/ch/njol/skript/patterns/TypePatternElement.java

Line 267 in 4d40944

private ExprInfo getExprInfo() {

If we don't wish to change that much at this time, we should at least just call getExprInfo earlier and check exprInfo.isOptional (less changes, but arguably a worse solution)

Wouldn't it be better to just loop in both cases? TypePatternElement is pretty hacky in that it checks for - twice, once before and once after checking for ~/*. Shouldn't we have a method that will loop over all the modifiers in the pattern and set their fields all at once instead of having to write out the entire loop manually like we currently do?

Right now it's check -, check ~*, check - again, but if we add X, now it's check -, check ~*, check - again, check X, check - a third time, check ~* again, check - a fourth time

[APickledWalrus]

That check can be improved, but we should prefer to use the already compiled patterns rather than the substring stuff going on here

[sovdeeth]

That check can be improved, but we should prefer to use the already compiled patterns rather than the substring stuff going on here

yeah makes sense

[Moderocky]

I've decided to fix both at the same time.

[APickledWalrus]

Looks good. Just to note, Kenzie and I discussed the usage of TypePatternElement and that will be targeted for another PR.

[APickledWalrus]

Suggested change

	public ExprInfo getExprInfo() {
	private ExprInfo getExprInfo() {

We can expose this in a future PR if necessary