diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 437d766..d9d1cd6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,26 +4,12 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -62,26 +48,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -179,7 +145,7 @@
-
+
@@ -292,8 +258,8 @@
-
+
@@ -555,8 +521,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/TODO b/TODO
index 8229715..b34b553 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,3 @@
-- error messages
-- permission support
-- suggestions/tab completion
-- description support, possibly shown with /help
-- dynamic default values: functional interface with context
\ No newline at end of file
+- fix missing ArgumentExpected error at first arg or smth (maybe all args are shifted ???)
+- make sure permissions of literals work
+- fix suggestions/tab completion
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index c48341d..74c7330 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,5 @@
group = "de.kentoj.scrow"
-version = "0.28"
+version = "0.30"
subprojects {
group = rootProject.group
diff --git a/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/api/CommandHandler.java b/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/api/CommandHandler.java
index 960a587..aef70d4 100644
--- a/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/api/CommandHandler.java
+++ b/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/api/CommandHandler.java
@@ -12,7 +12,6 @@ import org.jetbrains.annotations.Nullable;
import java.util.Arrays;
import java.util.List;
-import java.util.concurrent.CompletableFuture;
@RequiredArgsConstructor
public class CommandHandler {
@@ -34,7 +33,7 @@ public class CommandHandler {
if (ex != null)
sendMessageMethod.send(sender, rootNode.getMessageStyle().exception(ex));
result.ifFailure(failure ->
- sendMessageMethod.send(sender, rootNode.getMessageStyle().err(failure)));
+ sendMessageMethod.send(sender, rootNode.getMessageStyle().err(failure)));
});
}
diff --git a/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/api/parser/CommandParser.java b/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/api/parser/CommandParser.java
index 3f7a36a..9d3e277 100644
--- a/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/api/parser/CommandParser.java
+++ b/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/api/parser/CommandParser.java
@@ -27,7 +27,7 @@ public class CommandParser {
while (argStrIter.hasNext()) {
for (var nodeArg : cur.getArguments()) {
- var parsed = parseArgument(rootNode, nodeArg, argStrIter, sender, !parseArgs);
+ var parsed = parseArgument(rootNode, nodeArg, argStrIter, sender, parseArgs);
if (parsed.hasFailure())
return parsed.getFailure().orElseThrow();
if (parseArgs)
@@ -60,13 +60,13 @@ public class CommandParser {
CommandArgument nodeArg,
Iterator args,
T sender,
- boolean fakeParse
+ boolean parseArgs
) {
Object value;
if (args.hasNext()) {
var argStr = getRawArgument(args, nodeArg);
- if (fakeParse) {
+ if (!parseArgs) {
value = null;
} else {
try {