Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-09 18:08:37 +01:00
Code Issues Projects Releases Wiki Activity

Allow time unit to be omittable

Browse Source
This commit is contained in:
LeoDog896 2021-02-08 19:45:25 -05:00
parent 7705c03500
commit 01b4a1b582
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentTime.java
View File

@ -28,18 +28,14 @@ public class ArgumentTime extends Argument<UpdateOption> {
@NotNull
@Override
public UpdateOption parse(@NotNull String input) throws ArgumentSyntaxException {
// TODO time unit is omittable
final char lastChar = input.charAt(input.length() - 1);
if (!SUFFIXES.contains(lastChar))
throw new ArgumentSyntaxException("Time format is invalid", input, INVALID_TIME_FORMAT);
// Remove last char
input = input.substring(0, input.length() - 1);
try {
// Check if value is a number
final int time = Integer.parseInt(input);
TimeUnit timeUnit;
if (Character.isDigit(lastChar))
timeUnit = TimeUnit.TICK;
else if (SUFFIXES.contains(lastChar)) {
input = input.substring(0, input.length() - 1);
TimeUnit timeUnit;
if (lastChar == 'd') {
timeUnit = TimeUnit.DAY;
} else if (lastChar == 's') {
@ -47,13 +43,19 @@ public class ArgumentTime extends Argument<UpdateOption> {
} else if (lastChar == 't') {
timeUnit = TimeUnit.TICK;
} else {
throw new ArgumentSyntaxException("Time needs to have a unit", input, NO_NUMBER);
throw new ArgumentSyntaxException("Time needs to have the unit d, s, t, or none", input, NO_NUMBER);
}
} else
throw new ArgumentSyntaxException("Time needs to have a unit", input, NO_NUMBER);
try {
// Check if value is a number
final int time = Integer.parseInt(input);
return new UpdateOption(time, timeUnit);
} catch (NumberFormatException e) {
throw new ArgumentSyntaxException("Time needs to be a number", input, NO_NUMBER);
}
}
@NotNull