Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
ziqian zhang
Grasscutter
Commits
cbd66a74
Commit
cbd66a74
authored
Oct 17, 2022
by
AnimeGitB
Browse files
Fix ambiguous command regexes
parent
01e37cce
Changes
1
Show whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/command/CommandHelpers.java
View file @
cbd66a74
...
...
@@ -8,16 +8,16 @@ import java.util.regex.Matcher;
import
java.util.regex.Pattern
;
public
class
CommandHelpers
{
public
static
final
Pattern
lvlRegex
=
Pattern
.
compile
(
"l(?:vl?)?(\\d+)"
);
// Java doesn't have raw string literals :(
public
static
final
Pattern
amountRegex
=
Pattern
.
compile
(
"((?<=x)\\d+|\\d+(?=x)(?!x\\d))"
);
public
static
final
Pattern
refineRegex
=
Pattern
.
compile
(
"r(\\d+)"
);
public
static
final
Pattern
lvlRegex
=
Pattern
.
compile
(
"
(?<!\\w)
l(?:vl?)?(\\d+)"
);
// Java doesn't have raw string literals :(
public
static
final
Pattern
amountRegex
=
Pattern
.
compile
(
"((?<=
(?<!\\w)
x)\\d+|\\d+(?=x)(?!x\\d))"
);
public
static
final
Pattern
refineRegex
=
Pattern
.
compile
(
"
(?<!\\w)
r(\\d+)"
);
public
static
final
Pattern
rankRegex
=
Pattern
.
compile
(
"(\\d+)\\*"
);
public
static
final
Pattern
constellationRegex
=
Pattern
.
compile
(
"c(\\d+)"
);
public
static
final
Pattern
constellationRegex
=
Pattern
.
compile
(
"
(?<!\\w)
c(\\d+)"
);
public
static
final
Pattern
stateRegex
=
Pattern
.
compile
(
"state(\\d+)"
);
public
static
final
Pattern
blockRegex
=
Pattern
.
compile
(
"blk(\\d+)"
);
public
static
final
Pattern
groupRegex
=
Pattern
.
compile
(
"grp(\\d+)"
);
public
static
final
Pattern
configRegex
=
Pattern
.
compile
(
"cfg(\\d+)"
);
public
static
final
Pattern
hpRegex
=
Pattern
.
compile
(
"hp(\\d+)"
);
public
static
final
Pattern
hpRegex
=
Pattern
.
compile
(
"
(?<!\\w)
hp(\\d+)"
);
public
static
final
Pattern
maxHPRegex
=
Pattern
.
compile
(
"maxhp(\\d+)"
);
public
static
final
Pattern
atkRegex
=
Pattern
.
compile
(
"atk(\\d+)"
);
public
static
final
Pattern
defRegex
=
Pattern
.
compile
(
"def(\\d+)"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment