diff --git a/.bazelrc b/.bazelrc
deleted file mode 100644
index b6254e5..0000000
--- a/.bazelrc
+++ /dev/null
@@ -1,7 +0,0 @@
-build --java_language_version=25
-build --java_runtime_version=25
-build --tool_java_language_version=25
-build --tool_java_runtime_version=25
-build --define=maven_repo=https://repo.lab0x13.site/snapshots
-build --remote_cache=https://cache.lab0x13.site
-build --remote_upload_local_results=false
\ No newline at end of file
diff --git a/.forgejo/workflows/publish-artifact.yml b/.forgejo/workflows/publish-artifact.yml
deleted file mode 100644
index 8423916..0000000
--- a/.forgejo/workflows/publish-artifact.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-on:
- push:
- branches: [master]
-
-jobs:
- build:
- runs-on: docker
- container:
- image: "git.lab0x13.site/scrow/bazel-java:0.5"
- steps:
- - uses: actions/checkout@v7
- - id: build
- run: |
- bazel build //bukkit:bukkit.publish //core:core.publish //velocity:velocity.publish \
- --remote_cache='https://${{ secrets.CACHE_USERNAME }}:${{ secrets.CACHE_PASSWORD }}@cache.lab0x13.site' --remote_upload_local_results
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index bcca68a..1fac4d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,9 @@
-/.idea/inspectionProfiles
-/MODULE.bazel.lock
-/.bazelbsp
-/bazel-bin
-/bazel-out
-/bazel-KenCommandAPI
-/bazel-testlogs
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+.kotlin
### IntelliJ IDEA ###
.idea/modules.xml
diff --git a/.idea/bazelVersionCache.xml b/.idea/bazelVersionCache.xml
deleted file mode 100644
index 8501e9b..0000000
--- a/.idea/bazelVersionCache.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 3e3960b..a0486d1 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,4 +1,34 @@
+
+
+
\ No newline at end of file
diff --git a/.idea/jsonSchemas.xml b/.idea/jsonSchemas.xml
deleted file mode 100644
index 270275b..0000000
--- a/.idea/jsonSchemas.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6b56b62..03872dd 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index de9b6c3..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1dd..0b33847 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,6 @@
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6fbbbcb..1eb1391 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,49 +3,30 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -104,6 +85,19 @@
-
@@ -143,14 +136,6 @@
{
"keyToString": {
- "Bazel.//bukkit:bukkit.publish.executor": "Run",
- "Bazel.//core:core.publish.executor": "Run",
- "Bazel.//kencommandapi-velocity:velocity.publish.executor": "Run",
- "Bazel.//velocity:velocity.publish.executor": "Run",
- "Bazel.Run //kencommandapi-bukkit:bukkit.publish.executor": "Run",
- "Bazel.Run //kencommandapi-core:core.publish.executor": "Run",
- "Bazel.Run //kencommandapi-core:export.publish.executor": "Run",
- "Bazel.Run //kencommandapi-velocity:velocity.publish.executor": "Run",
"Gradle./home/a/src/kento2/KenCommandAPI/kencommandapi-core [:kencommandapi-core:de.kentoj.kencommandapi.Main.main()].executor": "Run",
"Gradle./home/a/src/kento2/KenCommandAPI/kencommandapi-core [build].executor": "Run",
"Gradle./home/a/src/kento2/KenCommandAPI/kencommandapi-core [publish].executor": "Run",
@@ -162,7 +147,6 @@
"Gradle.KenCommandAPI [build].executor": "Run",
"Gradle.KenCommandAPI [clean test].executor": "Run",
"Gradle.KenCommandAPI [clean].executor": "Run",
- "Gradle.KenCommandAPI [javadoc].executor": "Run",
"Gradle.KenCommandAPI [publishAllPublicationsToScrowRepository].executor": "Run",
"Gradle.KenCommandAPI [publish].executor": "Run",
"Gradle.KenCommandAPI [test].executor": "Run",
@@ -176,21 +160,12 @@
"RunOnceActivity.ShowReadmeOnStart": "true",
"RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
"RunOnceActivity.git.unshallow": "true",
- "RunOnceActivity.typescript.service.memoryLimit.init": "true",
- "SHARE_PROJECT_CONFIGURATION_FILES": "true",
- "bazel.project.detector.is.bazel.project": "true",
- "codeWithMe.voiceChat.enabledByDefault": "false",
- "com.intellij.ide.FileNotInSourceRootChecker.no.check": "true",
"git-widget-placeholder": "master",
"kotlin-language-version-configured": "true",
- "last_opened_file_path": "/home/a/src/random/rules_jvm_external",
- "node.js.detected.package.jshint": "true",
- "node.js.selected.package.jshint": "",
- "nodejs_package_manager_path": "npm",
+ "last_opened_file_path": "/home/a/src/scrow/core",
"project.structure.last.edited": "Modules",
"project.structure.proportion": "0.15",
"project.structure.side.proportion": "0.6268199",
- "remote.dev.show.docker.config.missing.jdk.notification": "false",
"settings.editor.selected.configurable": "preferences.pluginManager"
}
}
@@ -203,26 +178,19 @@
-
-
-
+
-
-
-
-
-
-
+
@@ -232,62 +200,34 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- @//bukkit:bukkit.publish
-
-
+
+
+
+
+
+
+
+
+
+
+
+ false
+ true
+ false
+ true
-
-
- @//core:core.publish
-
-
-
-
-
-
- @//kencommandapi-velocity:velocity.publish
-
-
-
-
-
-
- @//velocity:velocity.publish
-
-
-
-
-
+
@@ -298,49 +238,94 @@
true
true
- false
false
false
- false
- false
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ true
+ true
+ false
+ false
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+ true
+ true
+ false
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ true
+ false
+ false
-
-
-
-
-
-
-
-
-
@@ -576,9 +561,6 @@
-
-
-
\ No newline at end of file
diff --git a/MODULE.bazel b/MODULE.bazel
deleted file mode 100644
index a792429..0000000
--- a/MODULE.bazel
+++ /dev/null
@@ -1,30 +0,0 @@
-bazel_dep(name = "rules_java", version = "9.7.0")
-bazel_dep(name = "rules_jvm_external", version = "7.1")
-
-git_override(
- module_name = "rules_jvm_external",
- remote = "http://forge.kentoj.de/scrow/rules_jvm_external.git",
-)
-
-maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
-maven.install(
- name = "maven",
- artifacts = [
- "com.leakyabstractions:result-api:1.0.1.0",
- "com.leakyabstractions:result:1.0.2.0",
- "org.jetbrains:annotations:26.0.2-1",
- "com.google.guava:guava:33.5.0-jre",
- "org.projectlombok:lombok:1.18.46",
- "org.slf4j:slf4j-api:2.0.18",
- "org.slf4j:slf4j-simple:2.0.18",
- "net.kyori:adventure-api:5.2.0",
- "io.papermc.paper:paper-api:[26.2.build,)",
- "com.velocitypowered:velocity-api:4.1.0-20260802.091736-8",
- ],
- repositories = [
- "https://repo.papermc.io/repository/maven-public/",
- ],
- known_contributing_modules = ["protobuf"],
-)
-
-use_repo(maven, "maven")
\ No newline at end of file
diff --git a/README.md b/README.md
index c66dba4..4dd5331 100644
--- a/README.md
+++ b/README.md
@@ -1,97 +1,2 @@
-## TODO
-
-CI/CD to publish automatically
-
-## Build
-
-after installing bazel:
-```shell
-bazel build //bukkit
-bazel build //core
-bazel build //velocity
-```
-
-## Limitations
-
-- argument's can't require specific permissions.
-
-## Design
-
-Commands are trees of Literals.
-Literals can have arguments.
-Literals can also have Executors.
-
-arguments can be optional by giving them a default value.
-arguments can have suggestions.
-
-`/feed `:
-- feed is the root literal
-- `` is an argument: it's value is a User Object
-
-To allow the use of `/feed` without giving a user's name, i.e. to make the argument optional, we need to assign the
-user-argument a default value.
-
-### An example command
-
-Let's say we want to make a command that allows seeing how many coins another User has.
-If we don't specify a user, it should instead show the coins the sender has.
-
-### As a tree
-
-Visualized as a tree, we have a Node/Literal `coins` with an alias `balance` with an optional argument called `user`.
-To make an argument optional, it must have a default value.
-
-```text
-literal:coins/balance
-- has argument:user
-- has executor:getCoins
-```
-
-### As code
-
-```java
-import de.kentoj.kencommandapi.api.literal.RootLiteral;
-
-/**
- * Show the amount coins a user has.
- * If no user is given, it should show the amount the sender of the command has.
- */
-public class CoinsCommand {
-
- private final RootLiteral rootLiteral;
- private final CommandArgumentSpec userArg;
-
- public CoinsCommand() {
- userArg = CommandArgumentSpec.builder("user", new UserArgumentType())
- .withRequirement(p -> !p.hasPermission("economy.immune.getcoins"),
- "you can't see that player's balance")
- .withDefaultValue(CommandContext::sender)
- .build();
- rootLiteral = Literal.builder("coins", "balance")
- .withPermission("economy.command.coins")
- .withArgument(userArg)
- .withSyncExecutor(this::getCoins)
- .asRootLiteral(MessageStyle.PLAIN);
- }
-
- private Result getCoins(CommandContext ctx) {
- var user = ctx.getArg(userArg);
- ctx.getSender().sendMessage(user.name() + " has " + user.coins() + " coins");
- return Results.success(new Object());
- }
-
- public RootLiteral rootLiteral() {
- return rootLiteral;
- }
-}
-```
-
-If we wanted to report an error, we could do for example `return Results.failure("That user doesn't exist")`.
-However, if we have a smart UserArgumentType, it automatically makes sure that the user exists.
-Additionally, we can also a Requirement in the CommandArgumentSpec.
-
-The registration of the command is platform-dependant. Typically, a class called CommandAPI can be used.
-```java
-CommandAPI api = new CommandAPI();
-register(new CoinsCommand().rootLiteral());
-```
\ No newline at end of file
+example usage:
+http://forge.kentoj.de/scrow/core/src/commit/a55d9857738425e099fe9650cc1a705ceb2ece00/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/economy
\ No newline at end of file
diff --git a/TODO b/TODO
new file mode 100644
index 0000000..f3e61d5
--- /dev/null
+++ b/TODO
@@ -0,0 +1,10 @@
+- suggest next literal/argument
+- fix:
+```
+[22:05:39 ERROR]: Could not pass event AsyncTabCompleteEvent to CoreBukkit v1.0.0-SNAPSHOT
+java.lang.ArrayIndexOutOfBoundsException: Index 0 out of bounds for length 0
+ at core-bukkit-impl-all-1783368113525.jar//de.kentoj.kencommandapi.api.parser2.SuggestionCommandParser.getSuggestions(SuggestionCommandParser.java:39) ~[?:?]
+ at core-bukkit-impl-all-1783368113525.jar//de.kentoj.kencommandapi.api.CommandHandler.getSuggestions(CommandHandler.java:44) ~[?:?]
+ at core-bukkit-impl-all-1783368113525.jar//de.kentoj.kencommandapi.TabCompleteListener.onAsyncTabComplete(TabCompleteListener.java:27) ~[?:?]
+ at co.aikar.timings.TimedEventExecutor.execute(TimedEventExecutor.java:80) ~[paper-api-1.21.11-R0.1-SNAPSHOT.jar:?]
+```
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..b51ec73
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,7 @@
+group = "de.kentoj.scrow"
+version = "0.33-SNAPSHOT"
+
+subprojects {
+ group = rootProject.group
+ version = rootProject.version
+}
diff --git a/bukkit/BUILD b/bukkit/BUILD
deleted file mode 100644
index 47dc8a8..0000000
--- a/bukkit/BUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-load("@rules_jvm_external//:defs.bzl", "artifact", "java_export")
-
-java_export(
- name = "bukkit",
- maven_coordinates = "de.kentoj.scrow:kencommandapi-bukkit:0.34-SNAPSHOT",
- srcs = glob(["src/main/**/*.java"]),
- deps = [
- "//core",
- artifact("org.jetbrains:annotations"),
- artifact("io.papermc.paper:paper-api"),
- ],
- exports = [
- "//core",
- ],
-)
\ No newline at end of file
diff --git a/bukkit/src/main/java/de/kentoj/kencommandapi/BukkitKenCommand.java b/bukkit/src/main/java/de/kentoj/kencommandapi/BukkitKenCommand.java
deleted file mode 100644
index 410b141..0000000
--- a/bukkit/src/main/java/de/kentoj/kencommandapi/BukkitKenCommand.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package de.kentoj.kencommandapi;
-
-import de.kentoj.kencommandapi.api.CommandHandler;
-import de.kentoj.kencommandapi.api.literal.RootLiteral;
-import de.kentoj.kencommandapi.api.platform.MessageStyle;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Arrays;
-import java.util.stream.Stream;
-
-public class BukkitKenCommand extends Command {
-
- private final RootLiteral rootLiteral;
- private final CommandHandler commandHandler;
- private final Class senderType;
-
- protected BukkitKenCommand(CommandHandler commandHandler, RootLiteral rootLiteral, Class senderType) {
- super(rootLiteral.names()[0]);
- this.commandHandler = commandHandler;
- this.rootLiteral = rootLiteral;
- this.senderType = senderType;
-
- this.setAliases(Arrays.asList(rootLiteral.names()));
- this.setPermission(rootLiteral.permission());
- }
-
- @Override
- public boolean execute(@NotNull CommandSender commandSender, @NotNull String commandLabel, @NotNull String[] args) {
- if (!senderType.isInstance(commandSender)) {
- commandSender.sendMessage(MessageStyle.PLAIN.err("You can't use that command"));
- return true;
- }
- T sender = senderType.cast(commandSender);
-
- commandHandler.invoke(rootLiteral, sender, Stream.of(args).filter(str -> !str.isEmpty()));
- return true;
- }
-}
diff --git a/bukkit/src/main/java/de/kentoj/kencommandapi/TabCompleteListener.java b/bukkit/src/main/java/de/kentoj/kencommandapi/TabCompleteListener.java
deleted file mode 100644
index 6d6e080..0000000
--- a/bukkit/src/main/java/de/kentoj/kencommandapi/TabCompleteListener.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package de.kentoj.kencommandapi;
-
-import com.destroystokyo.paper.event.server.AsyncTabCompleteEvent;
-import de.kentoj.kencommandapi.api.CommandHandler;
-import org.bukkit.command.CommandSender;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-
-import java.util.Arrays;
-
-public class TabCompleteListener implements Listener {
-
- private final CommandAPI commandAPI;
- private final CommandHandler commandHandler;
- private final Class senderType;
-
- public TabCompleteListener(CommandAPI commandAPI, CommandHandler commandHandler, Class senderType) {
- this.commandAPI = commandAPI;
- this.commandHandler = commandHandler;
- this.senderType = senderType;
- }
-
- @EventHandler(ignoreCancelled = true)
- public void onAsyncTabComplete(AsyncTabCompleteEvent ev) {
- if (!ev.isCommand()) return;
- var args = ev.getBuffer().substring(1).split(" ");
- if (args.length == 0) return;
-
- var label = args[0];
- {
- // commands can be called with a ':' prefix. strip it.
- int l = label.indexOf(':');
- if (l >= 0)
- label = label.substring(l + 1);
- }
- var literal = commandAPI.getRegistered(label);
- if (literal == null) return;
-
- if (!senderType.isInstance(ev.getSender()))
- return;
-
- T sender = senderType.cast(ev.getSender());
- ev.setHandled(true);
- ev.setCompletions(commandHandler.getSuggestions(literal, sender, Arrays.copyOfRange(args, 1, args.length), ev.getBuffer().endsWith(" ")));
- }
-}
diff --git a/bukkit/src/main/java/de/kentoj/kencommandapi/type/OfflinePlayerArgumentType.java b/bukkit/src/main/java/de/kentoj/kencommandapi/type/OfflinePlayerArgumentType.java
deleted file mode 100644
index 5b17dd0..0000000
--- a/bukkit/src/main/java/de/kentoj/kencommandapi/type/OfflinePlayerArgumentType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package de.kentoj.kencommandapi.type;
-
-import de.kentoj.kencommandapi.api.argument.ArgumentType;
-import de.kentoj.kencommandapi.api.suggestion.SuggestionProvider;
-import de.kentoj.kencommandapi.suggestionprovider.PlayerSuggestionProvider;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-
-import java.util.UUID;
-
-public class OfflinePlayerArgumentType implements ArgumentType {
-
- @Override
- public OfflinePlayer parseInputUnchecked(String string) {
- // UUIDs are always 36 chars
- if (string.length() == 36) {
- try {
- return Bukkit.getOfflinePlayer(UUID.fromString(string));
- } catch (IllegalArgumentException ex) {
- throw new IllegalArgumentException("Invalid UUID");
- }
- }
-
- OfflinePlayer player = Bukkit.getPlayerExact(string);
- if (player == null || (!player.hasPlayedBefore() && !player.isOnline()))
- throw new IllegalArgumentException("Player not found");
- return player;
- }
-
- @Override
- public SuggestionProvider getDefaultSuggestionProvider() {
- return new PlayerSuggestionProvider<>();
- }
-}
diff --git a/bukkit/src/main/java/de/kentoj/kencommandapi/type/PlayerArgumentType.java b/bukkit/src/main/java/de/kentoj/kencommandapi/type/PlayerArgumentType.java
deleted file mode 100644
index 2b4065e..0000000
--- a/bukkit/src/main/java/de/kentoj/kencommandapi/type/PlayerArgumentType.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package de.kentoj.kencommandapi.type;
-
-import de.kentoj.kencommandapi.api.argument.ArgumentType;
-import de.kentoj.kencommandapi.api.suggestion.SuggestionProvider;
-import de.kentoj.kencommandapi.suggestionprovider.PlayerSuggestionProvider;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-public class PlayerArgumentType implements ArgumentType {
-
- @Override
- public Player parseInputUnchecked(String string) {
- var player = Bukkit.getPlayer(string);
- if (player == null) throw new IllegalArgumentException("player not online");
- return player;
- }
-
- @Override
- public SuggestionProvider getDefaultSuggestionProvider() {
- return new PlayerSuggestionProvider<>();
- }
-}
diff --git a/core/BUILD b/core/BUILD
deleted file mode 100644
index 03f0de0..0000000
--- a/core/BUILD
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@rules_jvm_external//:defs.bzl", "artifact", "java_export")
-
-java_export(
- name = "core",
- maven_coordinates = "de.kentoj.scrow:kencommandapi-core:0.34-SNAPSHOT",
- srcs = glob(["src/main/**/*.java"]),
- visibility = ["//visibility:public"],
- deps = [
- artifact("com.leakyabstractions:result-api"),
- artifact("com.leakyabstractions:result"),
- artifact("org.jetbrains:annotations"),
- artifact("com.google.guava:guava"),
- artifact("org.slf4j:slf4j-api"),
- artifact("net.kyori:adventure-api"),
- ],
-)
\ No newline at end of file
diff --git a/core/src/main/java/de/kentoj/kencommandapi/api/CommandHandler.java b/core/src/main/java/de/kentoj/kencommandapi/api/CommandHandler.java
deleted file mode 100644
index f728250..0000000
--- a/core/src/main/java/de/kentoj/kencommandapi/api/CommandHandler.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package de.kentoj.kencommandapi.api;
-
-import de.kentoj.kencommandapi.api.literal.RootLiteral;
-import de.kentoj.kencommandapi.api.platform.HasPermissionMethod;
-import de.kentoj.kencommandapi.api.platform.SendMessageMethod;
-import de.kentoj.kencommandapi.internal.parser.CommandParseHelper;
-import de.kentoj.kencommandapi.internal.parser.InvocationCommandParser;
-import de.kentoj.kencommandapi.internal.parser.SuggestionCommandParser;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Stream;
-
-public class CommandHandler {
-
- private final SendMessageMethod sendMessageMethod;
- private final InvocationCommandParser invocationParser;
- private final SuggestionCommandParser suggestionParser;
-
- public CommandHandler(SendMessageMethod sendMessageMethod, HasPermissionMethod hasPermissionMethod) {
- this.sendMessageMethod = sendMessageMethod;
- var parseHelper = new CommandParseHelper<>(hasPermissionMethod);
- invocationParser = new InvocationCommandParser<>(parseHelper);
- suggestionParser = new SuggestionCommandParser<>(parseHelper);
- }
-
- public void invoke(RootLiteral rootLiteral, T sender, Stream args) {
- invocationParser.parse(rootLiteral, sender, args.toList().iterator())
- .ifSuccessOrElse(data -> exec(rootLiteral, data),
- err -> sendMessageMethod.send(sender, rootLiteral.messageStyle().err(err)));
- }
-
- private void exec(RootLiteral rootLiteral, InvocationCommandParser.ExecutionData data) {
- var ctx = data.context();
- data.executor().execute(ctx)
- .whenComplete((result, ex) -> {
- if (ex != null)
- sendMessageMethod.send(ctx.sender(), rootLiteral.messageStyle().exception(ex));
- result.ifFailure(err ->
- sendMessageMethod.send(ctx.sender(), rootLiteral.messageStyle().err(err)));
- });
- }
-
- public List getSuggestions(RootLiteral rootNode, T sender, String[] args, boolean trailingSpace) {
- return suggestionParser.suggest(rootNode, sender, Arrays.stream(args).iterator(), trailingSpace);
- }
-}
\ No newline at end of file
diff --git a/core/src/main/java/de/kentoj/kencommandapi/api/argument/ArgumentRequirement.java b/core/src/main/java/de/kentoj/kencommandapi/api/argument/ArgumentRequirement.java
deleted file mode 100644
index 47a8976..0000000
--- a/core/src/main/java/de/kentoj/kencommandapi/api/argument/ArgumentRequirement.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package de.kentoj.kencommandapi.api.argument;
-
-import java.util.function.Predicate;
-
-/**
- * @param type of the parsed argument value
- */
-public record ArgumentRequirement(
- Predicate predicate,
- String message
-) {
-}
diff --git a/core/src/main/java/de/kentoj/kencommandapi/api/argument/CommandArgument.java b/core/src/main/java/de/kentoj/kencommandapi/api/argument/CommandArgument.java
deleted file mode 100644
index 8e79a06..0000000
--- a/core/src/main/java/de/kentoj/kencommandapi/api/argument/CommandArgument.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package de.kentoj.kencommandapi.api.argument;
-
-public interface CommandArgument {
-
- V value();
-
- CommandArgumentSpec argument();
-}
diff --git a/core/src/main/java/de/kentoj/kencommandapi/api/argument/CommandArgumentImpl.java b/core/src/main/java/de/kentoj/kencommandapi/api/argument/CommandArgumentImpl.java
deleted file mode 100644
index 71bd78a..0000000
--- a/core/src/main/java/de/kentoj/kencommandapi/api/argument/CommandArgumentImpl.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package de.kentoj.kencommandapi.api.argument;
-
-public record CommandArgumentImpl(
- V value,
- CommandArgumentSpec argument
-) implements CommandArgument {
-}
diff --git a/core/src/main/java/de/kentoj/kencommandapi/api/argument/CommandArgumentSpec.java b/core/src/main/java/de/kentoj/kencommandapi/api/argument/CommandArgumentSpec.java
deleted file mode 100644
index 726ad14..0000000
--- a/core/src/main/java/de/kentoj/kencommandapi/api/argument/CommandArgumentSpec.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package de.kentoj.kencommandapi.api.argument;
-
-import de.kentoj.kencommandapi.api.invocation.CommandContext;
-import de.kentoj.kencommandapi.api.suggestion.SuggestionProvider;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.function.Function;
-
-public sealed interface CommandArgumentSpec permits CommandArgumentSpecImpl {
-
- static CommandArgumentSpecBuilder builder(String id, ArgumentType type) {
- return new CommandArgumentSpecBuilder<>(id, type);
- }
-
- String id();
-
- ArgumentType type();
-
- /**
- * @throws IllegalArgumentException if string invalid or if a requirement is not met
- */
- V parseInput(String rawInput);
-
- @Nullable Function, V> defaultValueProvider();
-
- /**
- * @return the explicitly set SuggestionProvider or the default suggestions for the type if unset/null
- */
- /* explicit @NotNull to avoid confusion */
- @NotNull SuggestionProvider suggestionProvider();
-}
diff --git a/core/src/main/java/de/kentoj/kencommandapi/api/argument/CommandArgumentSpecBuilder.java b/core/src/main/java/de/kentoj/kencommandapi/api/argument/CommandArgumentSpecBuilder.java
deleted file mode 100644
index fa767e0..0000000
--- a/core/src/main/java/de/kentoj/kencommandapi/api/argument/CommandArgumentSpecBuilder.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package de.kentoj.kencommandapi.api.argument;
-
-import de.kentoj.kencommandapi.api.invocation.CommandContext;
-import de.kentoj.kencommandapi.api.suggestion.SuggestionProvider;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Function;
-import java.util.function.Predicate;
-
-/**
- * @param type of the command sender
- * @param type of the value
- */
-public class CommandArgumentSpecBuilder {
-
- private final String id;
- private final ArgumentType type;
- private @Nullable Function, V> defaultValueProvider;
- private @Nullable SuggestionProvider suggestionProvider;
- private final List> requirements = new ArrayList<>();
-
- public CommandArgumentSpecBuilder(String id, ArgumentType type) {
- this.id = id;
- this.type = type;
- }
-
- public CommandArgumentSpecBuilder withRequirement(Predicate predicate, String message) {
- requirements.add(new ArgumentRequirement<>(predicate, message));
- return this;
- }
-
- public CommandArgumentSpecBuilder withDefaultValue(@Nullable Function, V> defaultValueProvider) {
- this.defaultValueProvider = defaultValueProvider;
- return this;
- }
-
- public CommandArgumentSpecBuilder withSuggestionProvider(@Nullable SuggestionProvider suggestionProvider) {
- this.suggestionProvider = suggestionProvider;
- return this;
- }
-
- public CommandArgumentSpec build() {
- return new CommandArgumentSpecImpl<>(id, type, requirements, defaultValueProvider, suggestionProvider);
- }
-}
diff --git a/core/src/main/java/de/kentoj/kencommandapi/api/argument/CommandArgumentSpecImpl.java b/core/src/main/java/de/kentoj/kencommandapi/api/argument/CommandArgumentSpecImpl.java
deleted file mode 100644
index 2f80387..0000000
--- a/core/src/main/java/de/kentoj/kencommandapi/api/argument/CommandArgumentSpecImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package de.kentoj.kencommandapi.api.argument;
-
-import de.kentoj.kencommandapi.api.invocation.CommandContext;
-import de.kentoj.kencommandapi.api.suggestion.SuggestionProvider;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-import java.util.function.Function;
-
-public record CommandArgumentSpecImpl(
- String id,
- ArgumentType type,
- List> requirements,
- Function, V> defaultValueProvider,
- @Nullable SuggestionProvider suggestionProvider
-) implements CommandArgumentSpec {
-
- @Override
- public V parseInput(String rawInput) {
- var parsed = type.parseInputUnchecked(rawInput);
- for (var requirement : requirements) {
- if (!requirement.predicate().test(parsed))
- throw new IllegalArgumentException(requirement.message());
- }
- return parsed;
- }
-
- @Override
- public @Nullable Function, V> defaultValueProvider() {
- return defaultValueProvider;
- }
-
- @Override
- public @NotNull SuggestionProvider suggestionProvider() {
- return suggestionProvider != null ? suggestionProvider : type.getDefaultSuggestionProvider();
- }
-}
diff --git a/core/src/main/java/de/kentoj/kencommandapi/api/argument/types/StringArgumentType.java b/core/src/main/java/de/kentoj/kencommandapi/api/argument/types/StringArgumentType.java
deleted file mode 100644
index 6e0ee6a..0000000
--- a/core/src/main/java/de/kentoj/kencommandapi/api/argument/types/StringArgumentType.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package de.kentoj.kencommandapi.api.argument.types;
-
-import de.kentoj.kencommandapi.api.argument.ArgumentType;
-import de.kentoj.kencommandapi.api.suggestion.SuggestionProvider;
-
-public record StringArgumentType(boolean greedy) implements ArgumentType {
-
- @Override
- public String parseInputUnchecked(String string) {
- return string;
- }
-
- @Override
- public SuggestionProvider getDefaultSuggestionProvider() {
- return SuggestionProvider.none();
- }
-}
diff --git a/core/src/main/java/de/kentoj/kencommandapi/api/invocation/CommandContext.java b/core/src/main/java/de/kentoj/kencommandapi/api/invocation/CommandContext.java
deleted file mode 100644
index 471b14a..0000000
--- a/core/src/main/java/de/kentoj/kencommandapi/api/invocation/CommandContext.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package de.kentoj.kencommandapi.api.invocation;
-
-import de.kentoj.kencommandapi.api.argument.CommandArgument;
-import de.kentoj.kencommandapi.api.argument.CommandArgumentSpec;
-
-import java.util.Map;
-
-public interface CommandContext {
-
- T sender();
-
- CommandArgument getParsedArgument(String id);
-
- /**
- * @return the value of the argument with the specified id
- * @param the type of the value of the argument with the specified id
- */
- @SuppressWarnings("unchecked")
- default V getArg(String id) {
- return (V) getParsedArgument(id).value();
- }
-
- /**
- * @param arg the argument whose value to return
- * @return the value of the argument
- * @param the type of the value of the argument
- */
- default V getArg(CommandArgumentSpec arg) {
- return getArg(arg.id());
- }
-
- default CommandArgument getParsedArgument(CommandArgumentSpec arg) {
- return getParsedArgument(arg.id());
- }
-
- Map> parsedArguments();
-}
diff --git a/core/src/main/java/de/kentoj/kencommandapi/api/literal/Literal.java b/core/src/main/java/de/kentoj/kencommandapi/api/literal/Literal.java
deleted file mode 100644
index 57d9d76..0000000
--- a/core/src/main/java/de/kentoj/kencommandapi/api/literal/Literal.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package de.kentoj.kencommandapi.api.literal;
-
-import de.kentoj.kencommandapi.api.argument.CommandArgumentSpec;
-import de.kentoj.kencommandapi.api.invocation.CommandExecutor;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-
-public interface Literal {
- static LiteralBuilder builder(String... name) {
- return new LiteralBuilder<>(name);
- }
-
- @NotNull String[] names();
-
- /**
- * @return what the literal does
- */
- @Nullable String description();
-
- List> arguments();
-
- @Nullable CommandExecutor executor();
-
- @Nullable Literal getLiteral(@NotNull String name);
-
- @NotNull List> literals();
-
- @Nullable String permission();
-}
diff --git a/core/src/main/java/de/kentoj/kencommandapi/api/literal/LiteralBuilder.java b/core/src/main/java/de/kentoj/kencommandapi/api/literal/LiteralBuilder.java
deleted file mode 100644
index ec18fbb..0000000
--- a/core/src/main/java/de/kentoj/kencommandapi/api/literal/LiteralBuilder.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package de.kentoj.kencommandapi.api.literal;
-
-import de.kentoj.kencommandapi.api.argument.CommandArgumentSpec;
-import de.kentoj.kencommandapi.api.invocation.CommandExecutor;
-import de.kentoj.kencommandapi.api.invocation.SyncCommandExecutor;
-import de.kentoj.kencommandapi.api.platform.MessageStyle;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-public final class LiteralBuilder {
-
- private final String[] names;
- private @Nullable String description;
- private @Nullable CommandExecutor executor;
- private @Nullable String permission;
- private final List> arguments = new ArrayList<>();
- private final List> literals = new ArrayList<>();
-
- LiteralBuilder(String... names) {
- checkArgument(names.length > 0, "at least one name is required");
- this.names = names;
- }
-
- /**
- * @param description what the literal does
- */
- public LiteralBuilder withDescription(@Nullable String description) {
- this.description = description;
- return this;
- }
-
- public LiteralBuilder withExecutor(@Nullable CommandExecutor executor) {
- this.executor = executor;
- return this;
- }
-
- public LiteralBuilder withSyncExecutor(@Nullable SyncCommandExecutor executor) {
- return withExecutor(executor);
- }
-
- public LiteralBuilder withPermission(@Nullable String permission) {
- this.permission = permission;
- return this;
- }
-
- /**
- * @throws IllegalArgumentException if there is already an argument with the same id
- * @throws IllegalStateException if a greedy argument was added to the literal previously
- */
- public LiteralBuilder withArgument(CommandArgumentSpec argument) {
- checkArgument(!hasGreedyArg(), "cannot add an argument after a greedy argument");
- if (arguments.stream().anyMatch(arg -> arg.id().equals(argument.id())))
- throw new IllegalArgumentException("cannot add multiple arguments with the same id");
-
- this.arguments.add(argument);
- return this;
- }
-
- /**
- * @throws IllegalArgumentException if there is already a literal with the same name
- * @throws IllegalStateException if a greedy argument was added to the literal previously
- */
- public LiteralBuilder withLiteral(Literal literal) {
- checkArgument(!hasGreedyArg(), "cannot add a literal after a greedy argument");
- for (String name : literal.names())
- for (var l : literals)
- if (l.getLiteral(name) != null)
- throw new IllegalArgumentException("literal with same name already exists");
-
- this.literals.add(literal);
- return this;
- }
-
- public RootLiteral asRootLiteral(MessageStyle messageStyle) {
- return new RootLiteralImpl<>(names, description, literals, arguments, executor, permission, messageStyle);
- }
-
- public Literal build() {
- return new LiteralImpl<>(names, description, literals, arguments, executor, permission);
- }
-
- private boolean hasGreedyArg() {
- if (arguments.isEmpty()) return false;
- var arg = arguments.getLast();
- return arg != null && arg.type().greedy();
- }
-}
diff --git a/core/src/main/java/de/kentoj/kencommandapi/api/literal/LiteralImpl.java b/core/src/main/java/de/kentoj/kencommandapi/api/literal/LiteralImpl.java
deleted file mode 100644
index 0a26c1c..0000000
--- a/core/src/main/java/de/kentoj/kencommandapi/api/literal/LiteralImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package de.kentoj.kencommandapi.api.literal;
-
-import de.kentoj.kencommandapi.api.argument.CommandArgumentSpec;
-import de.kentoj.kencommandapi.api.invocation.CommandExecutor;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-
-/**
- * @param description what the literal does
- */
-record LiteralImpl(
- String[] names,
- String description,
- List> literals,
- List> arguments,
- CommandExecutor executor,
- @Nullable String permission
-) implements Literal {
-
- @Override
- public @Nullable Literal getLiteral(@NotNull String name) {
- for (Literal literal : literals) {
- for (var literalName : literal.names()) {
- if (literalName.equalsIgnoreCase(name))
- return literal;
- }
- }
- return null;
- }
-}
diff --git a/core/src/main/java/de/kentoj/kencommandapi/api/literal/RootLiteral.java b/core/src/main/java/de/kentoj/kencommandapi/api/literal/RootLiteral.java
deleted file mode 100644
index 42321f6..0000000
--- a/core/src/main/java/de/kentoj/kencommandapi/api/literal/RootLiteral.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package de.kentoj.kencommandapi.api.literal;
-
-import de.kentoj.kencommandapi.api.platform.MessageStyle;
-
-public sealed interface RootLiteral extends Literal permits RootLiteralImpl {
-
- MessageStyle messageStyle();
-}
diff --git a/core/src/main/java/de/kentoj/kencommandapi/api/literal/RootLiteralImpl.java b/core/src/main/java/de/kentoj/kencommandapi/api/literal/RootLiteralImpl.java
deleted file mode 100644
index d49b511..0000000
--- a/core/src/main/java/de/kentoj/kencommandapi/api/literal/RootLiteralImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package de.kentoj.kencommandapi.api.literal;
-
-import de.kentoj.kencommandapi.api.argument.CommandArgumentSpec;
-import de.kentoj.kencommandapi.api.invocation.CommandExecutor;
-import de.kentoj.kencommandapi.api.platform.MessageStyle;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-
-record RootLiteralImpl(
- String[] names,
- String description,
- List> literals,
- List> arguments,
- CommandExecutor executor,
- @Nullable String permission,
- MessageStyle messageStyle
-) implements RootLiteral {
- @Override
- public @Nullable Literal getLiteral(@NotNull String name) {
- for (var l : literals) {
- for (var lName : l.names())
- if (lName.equalsIgnoreCase(name))
- return l;
- }
- return null;
- }
-}
diff --git a/core/src/main/java/de/kentoj/kencommandapi/internal/CommandContextImpl.java b/core/src/main/java/de/kentoj/kencommandapi/internal/CommandContextImpl.java
deleted file mode 100644
index 5b8db98..0000000
--- a/core/src/main/java/de/kentoj/kencommandapi/internal/CommandContextImpl.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package de.kentoj.kencommandapi.internal;
-
-import de.kentoj.kencommandapi.api.argument.CommandArgument;
-import de.kentoj.kencommandapi.api.invocation.CommandContext;
-
-import java.util.Map;
-
-public record CommandContextImpl(
- T sender,
- Map> parsedArguments
-) implements CommandContext {
-
- @Override
- public CommandArgument getParsedArgument(String id) {
- try {
- //noinspection unchecked
- return (CommandArgument) parsedArguments.get(id);
- } catch (ClassCastException e) {
- throw new RuntimeException("requested argument with wrong type", e);
- }
- }
-}
diff --git a/core/src/main/java/de/kentoj/kencommandapi/internal/parser/CommandParseHelper.java b/core/src/main/java/de/kentoj/kencommandapi/internal/parser/CommandParseHelper.java
deleted file mode 100644
index 17b7774..0000000
--- a/core/src/main/java/de/kentoj/kencommandapi/internal/parser/CommandParseHelper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package de.kentoj.kencommandapi.internal.parser;
-
-import de.kentoj.kencommandapi.api.literal.Literal;
-import de.kentoj.kencommandapi.api.platform.HasPermissionMethod;
-
-import java.util.Iterator;
-
-public final class CommandParseHelper {
- private final HasPermissionMethod hasPermission;
-
- public CommandParseHelper(HasPermissionMethod hasPermission) {
- this.hasPermission = hasPermission;
- }
-
- public boolean hasPermission(T sender, Literal literal) {
- if (literal.permission() == null) return true;
- return hasPermission.test(sender, literal.permission());
- }
-
- public String parseInput(Iterator tokenIter, boolean isGreedy) {
- if (!isGreedy)
- return tokenIter.next();
- var builder = new StringBuilder();
- tokenIter.forEachRemaining(tok -> builder.append(" ").append(tok));
- builder.deleteCharAt(0);
- return builder.toString();
- }
-}
\ No newline at end of file
diff --git a/core/src/main/java/de/kentoj/kencommandapi/internal/parser/InvocationCommandParser.java b/core/src/main/java/de/kentoj/kencommandapi/internal/parser/InvocationCommandParser.java
deleted file mode 100644
index 8809dea..0000000
--- a/core/src/main/java/de/kentoj/kencommandapi/internal/parser/InvocationCommandParser.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package de.kentoj.kencommandapi.internal.parser;
-
-import com.leakyabstractions.result.api.Result;
-import com.leakyabstractions.result.core.Results;
-import de.kentoj.kencommandapi.api.argument.CommandArgument;
-import de.kentoj.kencommandapi.api.argument.CommandArgumentImpl;
-import de.kentoj.kencommandapi.api.argument.CommandArgumentSpec;
-import de.kentoj.kencommandapi.api.invocation.CommandContext;
-import de.kentoj.kencommandapi.api.invocation.CommandExecutor;
-import de.kentoj.kencommandapi.api.literal.Literal;
-import de.kentoj.kencommandapi.internal.CommandContextImpl;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import static java.util.Objects.requireNonNull;
-
-public class InvocationCommandParser {
-
- private final CommandParseHelper helper;
-
- public InvocationCommandParser(CommandParseHelper helper) {
- this.helper = helper;
- }
-
- public Result parse(
- Literal rootLiteral,
- T sender,
- Iterator tokenIter
- ) {
- Literal currentLiteral = rootLiteral;
- var ctx = new CommandContextImpl<>(sender, new HashMap<>());
-
- while (true) {
- {
- var result = processArguments(currentLiteral, ctx, tokenIter)
- .ifSuccess(ctx.parsedArguments()::putAll);
- if (result.hasFailure())
- return result.mapSuccess(_ -> null);
- }
-
- if (!tokenIter.hasNext()) {
- if (currentLiteral.executor() == null)
- return Results.failure("Literal expected");
- break;
- }
-
- var literalName = tokenIter.next();
- var nextLiteral = currentLiteral.getLiteral(literalName);
- var isIncompleteOrUnknown = nextLiteral == null || !helper.hasPermission(sender, nextLiteral);
- if (isIncompleteOrUnknown)
- return Results.failure("Unknown literal: " + literalName);
- currentLiteral = nextLiteral;
- }
-
- return Results.success(new ExecutionData(currentLiteral.executor(), ctx));
- }
-
- private Result>, String> processArguments(
- Literal literal,
- CommandContext ctx,
- Iterator tokenIter
- ) {
- Map> parsedArguments = new HashMap<>();
-
- for (var _argument : literal.arguments()) {
- @SuppressWarnings("unchecked")
- var argument = ((CommandArgumentSpec) _argument);
-
- Object value;
- if (!tokenIter.hasNext()) {
- if (argument.defaultValueProvider() == null)
- return Results.failure("Argument expected: " + argument.id());
- value = requireNonNull(argument.defaultValueProvider()).apply(ctx);
- } else {
- var input = helper.parseInput(tokenIter, argument.type().greedy());
- try {
- value = argument.parseInput(input);
- } catch (IllegalArgumentException ex) {
- return Results.failure("Illegal argument '" + input + "' for " + argument.id() + ": " + ex.getMessage());
- }
- }
-
- parsedArguments.put(argument.id(), new CommandArgumentImpl<>(value, argument));
- }
-
- return Results.success(parsedArguments);
- }
-
- public class ExecutionData {
- private final CommandExecutor executor;
- private final CommandContext context;
-
- public ExecutionData(CommandExecutor executor, CommandContext context) {
- this.executor = executor;
- this.context = context;
- }
-
- public CommandExecutor executor() {
- return executor;
- }
-
- public CommandContext context() {
- return context;
- }
- }
-}
diff --git a/core/src/main/java/de/kentoj/kencommandapi/internal/parser/SuggestionCommandParser.java b/core/src/main/java/de/kentoj/kencommandapi/internal/parser/SuggestionCommandParser.java
deleted file mode 100644
index 088a740..0000000
--- a/core/src/main/java/de/kentoj/kencommandapi/internal/parser/SuggestionCommandParser.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package de.kentoj.kencommandapi.internal.parser;
-
-import de.kentoj.kencommandapi.api.literal.Literal;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.stream.Stream;
-
-public class SuggestionCommandParser {
-
- private final CommandParseHelper helper;
-
- public SuggestionCommandParser(CommandParseHelper helper) {
- this.helper = helper;
- }
-
- public List suggest(
- Literal rootLiteral,
- T sender,
- Iterator tokenIter,
- boolean suggestNext
- ) {
- Literal currentLiteral = rootLiteral;
- Literal previousLiteral = null;
-
- while (true) {
- var argumentSuggestions = processArguments(currentLiteral, tokenIter, sender, suggestNext);
- if (argumentSuggestions != null)
- return argumentSuggestions;
-
- if (!tokenIter.hasNext()) {
- if (suggestNext || previousLiteral == null)
- return suggestions(currentLiteral, sender).toList();
- return suggestions(previousLiteral, sender).toList();
- }
-
- var input = tokenIter.next();
- var nextLiteral = currentLiteral.getLiteral(input);
- var isIncompleteOrUnknown = nextLiteral == null || !helper.hasPermission(sender, nextLiteral);
- if (isIncompleteOrUnknown) {
- var finalInput = input.toLowerCase();
- return suggestions(currentLiteral, sender)
- .filter(name -> name.toLowerCase().startsWith(finalInput))
- .toList();
- }
-
- previousLiteral = currentLiteral;
- currentLiteral = nextLiteral;
- }
- }
-
- private @Nullable List processArguments(
- Literal literal,
- Iterator tokenIter,
- T sender,
- boolean suggestNext
- ) {
- var argsIter = literal.arguments().iterator();
-
- /*
- for each argument:
- if no next token: suggest current
- parse token
- if not last token: skip
- if nextToken:
- if has next argument: suggest next argument
- else: return null
- return current argument's suggestions filtered
-
- */
-
- while (argsIter.hasNext()) {
- var argument = argsIter.next();
- if (!tokenIter.hasNext())
- return argument.suggestionProvider().suggest(sender);
- var input = helper.parseInput(tokenIter, argument.type().greedy()).toLowerCase();
- if (tokenIter.hasNext())
- continue;
- if (suggestNext) {
- if (argsIter.hasNext())
- return argsIter.next().suggestionProvider().suggest(sender);
- return null;
- }
- return argument.suggestionProvider().suggest(sender).stream()
- .filter(suggestion -> suggestion.toLowerCase().startsWith(input))
- .toList();
- }
- return null;
- }
-
- private Stream suggestions(Literal literal, T sender) {
- return literal.literals().stream()
- .filter(lit -> helper.hasPermission(sender, lit))
- .map(Literal::names)
- .flatMap(Arrays::stream);
- }
-}
diff --git a/core/src/test/java/de/kentoj/kencommandapi/api/parser/SuggestionCommandParserTest.java b/core/src/test/java/de/kentoj/kencommandapi/api/parser/SuggestionCommandParserTest.java
deleted file mode 100644
index 37c5725..0000000
--- a/core/src/test/java/de/kentoj/kencommandapi/api/parser/SuggestionCommandParserTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package de.kentoj.kencommandapi.api.parser;
-
-import de.kentoj.kencommandapi.api.argument.CommandArgument;
-import de.kentoj.kencommandapi.api.argument.types.StringArgumentType;
-import de.kentoj.kencommandapi.api.literal.Literal;
-import de.kentoj.kencommandapi.api.literal.Literal;
-import de.kentoj.kencommandapi.api.platform.MessageStyle;
-import de.kentoj.kencommandapi.internal.parser.SuggestionCommandParser;
-import org.junit.jupiter.api.Test;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Stream;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class SuggestionCommandParserTest {
-
- private final SuggestionCommandParser