From 7a0e9f8b6320e61766d3e3254176d3c329db2154 Mon Sep 17 00:00:00 2001 From: kento2 Date: Mon, 10 Aug 2026 00:43:37 +0200 Subject: [PATCH] . --- .../de/kentoj/kencommandapi/api/CommandHandler.java | 13 +++++-------- .../api/invocation/CommandExecutor.java | 4 ++-- .../api/invocation/SyncCommandExecutor.java | 9 +++++---- .../kencommandapi/api/literal/RootLiteral.java | 2 +- .../kencommandapi/api/literal/RootLiteralImpl.java | 2 +- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/core/src/main/java/de/kentoj/kencommandapi/api/CommandHandler.java b/core/src/main/java/de/kentoj/kencommandapi/api/CommandHandler.java index c9d6af0..299992e 100644 --- a/core/src/main/java/de/kentoj/kencommandapi/api/CommandHandler.java +++ b/core/src/main/java/de/kentoj/kencommandapi/api/CommandHandler.java @@ -27,17 +27,14 @@ public class CommandHandler { public void invoke(RootLiteral rootLiteral, T sender, Stream args) { var walkResult = nodeTreeWalker.walk(rootLiteral, sender, args.iterator()); if (!walkResult.isValidUsage()) { - sendMessageMethod.send(sender, rootLiteral.messageStyle().err(walkResult.message())); + sendMessageMethod.send(sender, rootLiteral.style().err(walkResult.message())); return; } - requireNonNull(walkResult.lastLiteral().executor()) - .execute(walkResult.ctx()) - .whenComplete((result, ex) -> { - if (ex != null) - sendMessageMethod.send(sender, rootLiteral.messageStyle().exception(ex)); - result.ifFailure(err -> - sendMessageMethod.send(sender, rootLiteral.messageStyle().err(err))); + .execute(rootLiteral.style(), walkResult.ctx()) + .exceptionally(ex -> { + sendMessageMethod.send(sender, rootLiteral.style().exception(ex)); + return null; }); } diff --git a/core/src/main/java/de/kentoj/kencommandapi/api/invocation/CommandExecutor.java b/core/src/main/java/de/kentoj/kencommandapi/api/invocation/CommandExecutor.java index eaef027..23c5bca 100644 --- a/core/src/main/java/de/kentoj/kencommandapi/api/invocation/CommandExecutor.java +++ b/core/src/main/java/de/kentoj/kencommandapi/api/invocation/CommandExecutor.java @@ -1,10 +1,10 @@ package de.kentoj.kencommandapi.api.invocation; -import com.leakyabstractions.result.api.Result; +import de.kentoj.kencommandapi.api.platform.MessageStyle; import java.util.concurrent.CompletableFuture; public interface CommandExecutor { - CompletableFuture> execute(CommandContext ctx); + CompletableFuture execute(MessageStyle style, CommandContext ctx); } diff --git a/core/src/main/java/de/kentoj/kencommandapi/api/invocation/SyncCommandExecutor.java b/core/src/main/java/de/kentoj/kencommandapi/api/invocation/SyncCommandExecutor.java index 67d09c3..0ec1480 100644 --- a/core/src/main/java/de/kentoj/kencommandapi/api/invocation/SyncCommandExecutor.java +++ b/core/src/main/java/de/kentoj/kencommandapi/api/invocation/SyncCommandExecutor.java @@ -1,14 +1,15 @@ package de.kentoj.kencommandapi.api.invocation; -import com.leakyabstractions.result.api.Result; +import de.kentoj.kencommandapi.api.platform.MessageStyle; import java.util.concurrent.CompletableFuture; public interface SyncCommandExecutor extends CommandExecutor { - Result executeSync(CommandContext ctx); + void executeSync(MessageStyle style, CommandContext ctx); - default CompletableFuture> execute(CommandContext ctx) { - return CompletableFuture.completedFuture(this.executeSync(ctx)); + default CompletableFuture execute(MessageStyle style, CommandContext ctx) { + this.executeSync(style, ctx); + return CompletableFuture.completedFuture(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 index 42321f6..66d66c8 100644 --- a/core/src/main/java/de/kentoj/kencommandapi/api/literal/RootLiteral.java +++ b/core/src/main/java/de/kentoj/kencommandapi/api/literal/RootLiteral.java @@ -4,5 +4,5 @@ import de.kentoj.kencommandapi.api.platform.MessageStyle; public sealed interface RootLiteral extends Literal permits RootLiteralImpl { - MessageStyle messageStyle(); + MessageStyle style(); } 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 index d49b511..e580754 100644 --- a/core/src/main/java/de/kentoj/kencommandapi/api/literal/RootLiteralImpl.java +++ b/core/src/main/java/de/kentoj/kencommandapi/api/literal/RootLiteralImpl.java @@ -15,7 +15,7 @@ record RootLiteralImpl( List> arguments, CommandExecutor executor, @Nullable String permission, - MessageStyle messageStyle + MessageStyle style ) implements RootLiteral { @Override public @Nullable Literal getLiteral(@NotNull String name) {