Skip to content

Add support for ranged item amounts in Give and GiveAll commands #48

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

Open
AerWyn81 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for ranged item amounts in Give and GiveAll commands #48

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
27 changes: 25 additions & 2 deletions src/main/java/emanondev/itemedit/command/serveritem/Give.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,30 @@ public void onCommand(@NotNull CommandSender sender, @NotNull String alias, Stri
if (silent == null) {
silent = Boolean.valueOf(args[4]);
}
int amount = args.length >= 3 ? Integer.parseInt(args[2]) : 1;
int amount;
if (args.length >= 3) {
String amountArg = args[2];
if (amountArg.contains("-")) {
String[] range = amountArg.split("-");
if (range.length != 2) {
throw new IllegalArgumentException("Invalid range format");
}
try {
int min = Integer.parseInt(range[0]);
int max = Integer.parseInt(range[1]);
if (min < 1 || max < 1 || min > max) {
throw new IllegalArgumentException("Wrong amount range");
}
amount = min + (int) (Math.random() * (max - min + 1));
} catch (NumberFormatException e) {
throw new IllegalArgumentException("Invalid number format in range");
}
} else {
amount = Integer.parseInt(amountArg);
}
} else {
amount = 1;
}
if (amount < 1) {
throw new IllegalArgumentException("Wrong amount number");
}
Expand Down Expand Up @@ -85,7 +108,7 @@ public List<String> onComplete(@NotNull CommandSender sender, String[] args) {
case 2:
return CompleteUtility.complete(args[1], ItemEdit.get().getServerStorage().getIds());
case 3:
return CompleteUtility.complete(args[2], Arrays.asList("1", "10", "64", "576", "2304"));
return CompleteUtility.complete(args[2], Arrays.asList("1", "10", "64", "576", "2304", "1-10", "1-64"));
case 4:
return CompleteUtility.completePlayers(args[3]);
case 5:
Expand Down
27 changes: 25 additions & 2 deletions src/main/java/emanondev/itemedit/command/serveritem/GiveAll.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,30 @@ public void onCommand(@NotNull CommandSender sender, @NotNull String alias, Stri
if (silent == null) {
silent = Boolean.valueOf(args[3]);
}
int amount = args.length >= 3 ? Integer.parseInt(args[2]) : 1;
int amount;
if (args.length >= 3) {
String amountArg = args[2];
if (amountArg.contains("-")) {
String[] range = amountArg.split("-");
if (range.length != 2) {
throw new IllegalArgumentException("Invalid range format");
}
try {
int min = Integer.parseInt(range[0]);
int max = Integer.parseInt(range[1]);
if (min < 1 || max < 1 || min > max) {
throw new IllegalArgumentException("Wrong amount range");
}
amount = min + (int) (Math.random() * (max - min + 1));
} catch (NumberFormatException e) {
throw new IllegalArgumentException("Invalid number format in range");
}
} else {
amount = Integer.parseInt(amountArg);
}
} else {
amount = 1;
}
if (amount < 1) {
throw new IllegalArgumentException("Wrong amount number");
}
Expand Down Expand Up @@ -104,7 +127,7 @@ public List<String> onComplete(@NotNull CommandSender sender, String[] args) {
case 2:
return CompleteUtility.complete(args[1], ItemEdit.get().getServerStorage().getIds());
case 3:
return CompleteUtility.complete(args[2], Arrays.asList("1", "10", "64", "576", "2304"));
return CompleteUtility.complete(args[2], Arrays.asList("1", "10", "64", "576", "2304", "1-10", "1-64"));
case 4:
return CompleteUtility.complete(args[3], Aliases.BOOLEAN);
}
Expand Down