Skip to content

Rework CommandArguments #663

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
GliczDev wants to merge 2 commits into
base: dev/dev
Choose a base branch
from
Open

Rework CommandArguments #663

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
747dbdc
Rework CommandArguments
GliczDev Jul 31, 2025
0bc44fc
Resolve changes request
GliczDev Aug 1, 2025
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
Prev Previous commit
Resolve changes request
  • Loading branch information
@GliczDev
GliczDev committed Aug 1, 2025
commit 0bc44fcd2a7270ec507fb5b78182f8ca27e6d3a4
44 changes: 23 additions & 21 deletions commandapi-core/src/main/java/dev/jorel/commandapi/executors/CommandArguments.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,11 @@ public int count() {
* @param index The index of the argument
* @param <T> The expected type of the argument
* @return The argument at the given index
* @throws NullPointerException If no argument is found for the index
* @throws IllegalArgumentException If no argument is found for the index
*/
public <T> T get(int index) {
if (index < 0 || index >= args.length) {
throw new NullPointerException("No argument found at index " + index);
throw new IllegalArgumentException("No argument found at index " + index);
}

return (T) args[index];
Expand All @@ -113,13 +113,15 @@ public <T> T get(int index) {
* @param nodeName The node name of the argument
* @param <T> The expected type of the argument
* @return The argument with given node name
* @throws NullPointerException If no argument is found for the given node name
* @throws IllegalArgumentException If no argument is found for the given node name
*/
public <T> T get(String nodeName) {
return Objects.requireNonNull(
(T) argsMap.get(nodeName),
"No argument found for name " + nodeName
);
T value = (T) argsMap.get(nodeName);
if (value == null) {
throw new IllegalArgumentException("No argument found for name " + nodeName);
}

return value;
}

/**
Expand Down Expand Up @@ -149,8 +151,7 @@ public <T> T get(String nodeName) {
*/
@Contract("_, !null -> !null")
public <T> @Nullable T getOrDefault(String nodeName, @Nullable T defaultValue) {
T value = (T) argsMap.get(nodeName);
return value != null ? value : defaultValue;
return (T) argsMap.getOrDefault(nodeName, defaultValue);
}

/**
Expand Down Expand Up @@ -219,11 +220,11 @@ public <T> Optional<T> getOptional(String nodeName) {
* When using this method to access these arguments, {@code @e} and {@code 15.3} will be available as {@link String}s and not as a {@link Collection} and {@link Double}
*
* @return The raw argument at the given index
* @throws NullPointerException If no argument is found for the index
* @throws IllegalArgumentException If no argument is found for the index
*/
public String getRaw(int index) {
if (index < 0 || index >= args.length) {
throw new NullPointerException("No argument found at index " + index);
throw new IllegalArgumentException("No argument found at index " + index);
}

return rawArgs[index];
Expand All @@ -244,10 +245,12 @@ public String getRaw(int index) {
* @throws NullPointerException If no argument is found for the given node name
*/
public String getRaw(String nodeName) {
return Objects.requireNonNull(
rawArgsMap.get(nodeName),
"No argument found for name " + nodeName
);
String value = rawArgsMap.get(nodeName);
if (value == null) {
throw new IllegalArgumentException("No argument found for name " + nodeName);
}

return value;
}

/**
Expand All @@ -261,7 +264,7 @@ public String getRaw(String nodeName) {
* When using this method to access these arguments, {@code @e} and {@code 15.3} will be available as {@link String}s and not as a {@link Collection} and {@link Double}
*
* @param index The index of the argument
* @param defaultValue The value returned when no argument is found for the index
* @param defaultValue The String returned when no argument is found for the index
* @return The raw argument at the given index, or the default value
*/
@Contract("_, !null -> !null")
Expand All @@ -284,13 +287,12 @@ public String getRaw(String nodeName) {
* When using this method to access these arguments, {@code @e} and {@code 15.3} will be available as {@link String}s and not as a {@link Collection} and {@link Double}
*
* @param nodeName The node name of the argument
* @param defaultValue The value returned when no argument is found for the node name
* @param defaultValue The String returned when no argument is found for the node name
* @return The raw argument with given node name, or the default value
*/
@Contract("_, !null -> !null")
public @Nullable String getOrDefaultRaw(String nodeName, @Nullable String defaultValue) {
String value = rawArgsMap.get(nodeName);
return value != null ? value : defaultValue;
return rawArgsMap.getOrDefault(nodeName, defaultValue);
}

/**
Expand All @@ -304,7 +306,7 @@ public String getRaw(String nodeName) {
* When using this method to access these arguments, {@code @e} and {@code 15.3} will be available as {@link String}s and not as a {@link Collection} and {@link Double}
*
* @param index The index of the argument
* @param defaultValue The value returned when no argument is found for the index
* @param defaultValue The String returned when no argument is found for the index
* @return The raw argument at the given index, or the default value
*/
public @Nullable String getOrDefaultRaw(int index, Supplier<@Nullable String> defaultValue) {
Expand All @@ -326,7 +328,7 @@ public String getRaw(String nodeName) {
* When using this method to access these arguments, {@code @e} and {@code 15.3} will be available as {@link String}s and not as a {@link Collection} and {@link Double}
*
* @param nodeName The node name of the argument
* @param defaultValue The value returned when no argument is found for the node name
* @param defaultValue The String returned when no argument is found for the node name
* @return The raw argument with the given node name, or the default value
*/
public @Nullable String getOrDefaultRaw(String nodeName, Supplier<@Nullable String> defaultValue) {
Expand Down