From 6449d95b66191a91135b1891acac06e593cc51fc Mon Sep 17 00:00:00 2001 From: kento2 Date: Wed, 3 Jun 2026 01:30:22 +0200 Subject: [PATCH] . --- build.gradle.kts | 2 +- .../de/kentoj/kencommandapi/type/PlayerArgumentType.java | 6 +----- .../kentoj/kencommandapi/api/types/StringArgumentType.java | 5 +++++ .../kentoj/kencommandapi/impl/AbstractKenCommandApi.java | 7 +++---- .../kencommandapi/impl/structure/CommandNodeImpl.java | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 75eb778..4d892b6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ plugins { } group = "de.kentoj.scrow" -version = "0.6" +version = "0.8" fun RepositoryHandler.scrowRepo() = maven { name = "scrow" diff --git a/kencommandapi-bukkit/src/main/java/de/kentoj/kencommandapi/type/PlayerArgumentType.java b/kencommandapi-bukkit/src/main/java/de/kentoj/kencommandapi/type/PlayerArgumentType.java index 8de4ef3..6d7ebc1 100644 --- a/kencommandapi-bukkit/src/main/java/de/kentoj/kencommandapi/type/PlayerArgumentType.java +++ b/kencommandapi-bukkit/src/main/java/de/kentoj/kencommandapi/type/PlayerArgumentType.java @@ -1,10 +1,9 @@ package de.kentoj.kencommandapi.type; import de.kentoj.kencommandapi.BukkitCommandContext; -import de.kentoj.kencommandapi.api.processing.CommandException; import de.kentoj.kencommandapi.api.argument.ArgumentType; import de.kentoj.kencommandapi.api.argument.SuggestionProvider; -import de.kentoj.kencommandapi.api.argument.suggestion.NoSuggestionProvider; +import de.kentoj.kencommandapi.api.processing.CommandException; import de.kentoj.kencommandapi.suggestionprovider.PlayerSuggestionProvider; import lombok.AccessLevel; import lombok.Getter; @@ -13,9 +12,6 @@ import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import java.util.Set; -import java.util.concurrent.CompletableFuture; - @NoArgsConstructor(access = AccessLevel.PRIVATE) public class PlayerArgumentType implements ArgumentType { diff --git a/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/api/types/StringArgumentType.java b/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/api/types/StringArgumentType.java index de660fd..e0887f2 100644 --- a/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/api/types/StringArgumentType.java +++ b/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/api/types/StringArgumentType.java @@ -4,6 +4,7 @@ import de.kentoj.kencommandapi.api.argument.ArgumentType; import de.kentoj.kencommandapi.api.argument.SuggestionProvider; import de.kentoj.kencommandapi.api.argument.suggestion.NoSuggestionProvider; import de.kentoj.kencommandapi.api.processing.CommandContext; +import lombok.AllArgsConstructor; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor @@ -11,6 +12,10 @@ public class StringArgumentType> implements Ar private final boolean isGreedy; + public StringArgumentType() { + this(false); + } + @Override public String parseInput(String string) { return string; diff --git a/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/impl/AbstractKenCommandApi.java b/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/impl/AbstractKenCommandApi.java index 51793f1..e9fcc6b 100644 --- a/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/impl/AbstractKenCommandApi.java +++ b/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/impl/AbstractKenCommandApi.java @@ -1,12 +1,12 @@ package de.kentoj.kencommandapi.impl; import de.kentoj.kencommandapi.api.KenCommandApi; -import de.kentoj.kencommandapi.api.processing.CommandContext; -import de.kentoj.kencommandapi.api.processing.CommandException; -import de.kentoj.kencommandapi.api.processing.ParsedArgument; import de.kentoj.kencommandapi.api.argument.ArgumentType; import de.kentoj.kencommandapi.api.argument.CommandArgument; import de.kentoj.kencommandapi.api.nodes.CommandNode; +import de.kentoj.kencommandapi.api.processing.CommandContext; +import de.kentoj.kencommandapi.api.processing.CommandException; +import de.kentoj.kencommandapi.api.processing.ParsedArgument; import de.kentoj.kencommandapi.impl.processing.ParsedArgumentImpl; import de.kentoj.kencommandapi.impl.structure.CommandArgumentImpl; import de.kentoj.kencommandapi.impl.structure.CommandNodeImpl; @@ -16,7 +16,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import java.util.stream.Collectors; @RequiredArgsConstructor public abstract class AbstractKenCommandApi> implements KenCommandApi { diff --git a/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/impl/structure/CommandNodeImpl.java b/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/impl/structure/CommandNodeImpl.java index f216b95..e437b9b 100644 --- a/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/impl/structure/CommandNodeImpl.java +++ b/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/impl/structure/CommandNodeImpl.java @@ -62,7 +62,7 @@ public class CommandNodeImpl> implements Comma if (arguments.stream() .anyMatch(arg -> arg.getId().equals(argument.getId())) ) throw new IllegalArgumentException("argument with same identifier is already added"); - if (arguments.getLast().getType().isGreedy()) + if (!arguments.isEmpty() && arguments.getLast().getType().isGreedy()) throw new IllegalStateException("can't append argument to a node, whose last argument type is greedy: " + arguments.getLast().getType().getClass().getCanonicalName());