Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-29 14:26:10 +00:00
Code Issues Projects Releases Wiki Activity

Refactor command kwarg parsing

Browse Source
This commit is contained in:
AnimeGitB 2022-11-03 01:13:16 +10:30
parent e8930e92e1
commit c926fe326c
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/emu/grasscutter/command/CommandHelpers.java
View File

@ -33,21 +33,18 @@ public class CommandHelpers {
} }
public static <T> List<String> parseIntParameters(List<String> args, @Nonnull T params, Map<Pattern, BiConsumer<T, Integer>> map) { public static <T> List<String> parseIntParameters(List<String> args, @Nonnull T params, Map<Pattern, BiConsumer<T, Integer>> map) {
for (int i = args.size() - 1; i >= 0; i--) { args.removeIf(arg -> {
String arg = args.get(i).toLowerCase(); var argL = arg.toLowerCase();
boolean deleteArg = false; boolean deleteArg = false;
int argNum;
for (var entry : map.entrySet()) { for (var entry : map.entrySet()) {
if ((argNum = matchIntOrNeg(entry.getKey(), arg)) != -1) { int argNum = matchIntOrNeg(entry.getKey(), argL);
if (argNum != -1) {
entry.getValue().accept(params, argNum); entry.getValue().accept(params, argNum);
deleteArg = true; deleteArg = true;
break;
}
}
if (deleteArg) {
args.remove(i);
} }
} }
return deleteArg;
});
return args; return args;
} }
} }