From be248bfea98519703fc67463bc7eef3ec67c9702 Mon Sep 17 00:00:00 2001 From: kento2 Date: Mon, 6 Jul 2026 22:09:03 +0200 Subject: [PATCH] update kencommandapi ig --- .../kentoj/scrow/bukkit/CoreImplPlugin.java | 7 +++---- .../bukkit/command/economy/CoinsCommand.java | 16 +++++++-------- .../command/economy/CoinsGetLiteral.java | 6 +++--- .../command/economy/CoinsSetLiteral.java | 6 +++--- .../command/friends/FriendAddLiteral.java | 6 +++--- .../bukkit/command/friends/FriendCommand.java | 20 +++++++++---------- .../command/friends/FriendListLiteral.java | 6 +++--- .../command/friends/FriendRemoveLiteral.java | 6 +++--- .../friends/FriendRequestDeclineLiteral.java | 6 +++--- .../friends/FriendRequestsLiteral.java | 6 +++--- .../command/instance/InstanceCommand.java | 16 +++++++-------- .../instance/InstanceDeployLiteral.java | 6 +++--- .../instance/InstanceDestroyLiteral.java | 6 +++--- .../command/instance/InstanceListLiteral.java | 6 +++--- .../bukkit/command/instance/LobbyCommand.java | 10 +++++----- .../bukkit/command/instance/PlayCommand.java | 12 +++++------ .../bukkit/listener/ChatStyleListener.java | 1 + .../corevelocity/CoreVelocityPlugin.java | 6 +++--- .../corevelocity/command/OnlineCommand.java | 10 +++++----- .../corevelocity/privmsg/MsgCommand.java | 14 ++++++------- .../corevelocity/privmsg/ReplyCommand.java | 12 +++++------ gradle/libs.versions.toml | 2 +- 22 files changed, 93 insertions(+), 93 deletions(-) diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java index 5a5b25d..acda52c 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java +++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java @@ -21,15 +21,14 @@ public class CoreImplPlugin extends JavaPlugin { public void onEnable() { ScrowAPISurface.initScrowAPI(this); { - ScrowAPI.getCommandApi().register(new CoinsCommand().getRootNode()); + ScrowAPI.getCommandApi().register(new CoinsCommand().getRootLiteral()); ScrowAPI.getCommandApi().register(FriendCommand.create()); var instanceCache = new InstanceCache(); ScrowAPI.getCommandApi().register(InstanceCommand.create(instanceCache)); - ScrowAPI.getCommandApi().register(new PlayCommand().getRootNode()); - ScrowAPI.getCommandApi().register(new LobbyCommand().getRootNode()); + ScrowAPI.getCommandApi().register(new PlayCommand().getRootLiteral()); + ScrowAPI.getCommandApi().register(new LobbyCommand().getRootLiteral()); } - // Listeners getServer().getPluginManager().registerEvents(new ChatStyleListener(), this); // TODO/FIXME diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsCommand.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsCommand.java index 6690ac5..a3044f7 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsCommand.java +++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsCommand.java @@ -4,8 +4,8 @@ import com.leakyabstractions.result.api.Result; import com.leakyabstractions.result.core.Results; import de.kentoj.kencommandapi.api.invocation.CommandContext; import de.kentoj.kencommandapi.api.invocation.CommandExecutor; -import de.kentoj.kencommandapi.api.node.CommandNode; -import de.kentoj.kencommandapi.api.node.RootCommandNode; +import de.kentoj.kencommandapi.api.literal.Literal; +import de.kentoj.kencommandapi.api.literal.RootLiteral; import de.kentoj.kencommandapi.api.platform.MessageStyle; import de.kentoj.scrow.bukkit.ScrowAPI; import de.kentoj.scrow.bukkit.scheduler.Tasks; @@ -18,22 +18,22 @@ import java.util.concurrent.CompletableFuture; public class CoinsCommand implements CommandExecutor { @Getter - private final RootCommandNode rootNode; + private final RootLiteral rootLiteral; private final MessageStyle style; public CoinsCommand() { style = ScrowMessageStyle.GENERIC; - rootNode = CommandNode.rootNode(style, "coins", "bal", "balance"); - rootNode.setPermission("command.coins.get.self"); - rootNode.setExecutor(this); + rootLiteral = Literal.rootLiteral(style, "coins", "bal", "balance"); + rootLiteral.setPermission("command.coins.get.self"); + rootLiteral.setExecutor(this); var setLiteral = new CoinsSetLiteral(style).getLiteral(); setLiteral.setPermission("command.coins.set"); - rootNode.addLiteral(setLiteral); + rootLiteral.addLiteral(setLiteral); var getLiteral = new CoinsGetLiteral(style).getLiteral(); getLiteral.setPermission("command.coins.get.others"); - rootNode.addLiteral(getLiteral); + rootLiteral.addLiteral(getLiteral); } @Override diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsGetLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsGetLiteral.java index 8cda9ea..5213511 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsGetLiteral.java +++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsGetLiteral.java @@ -5,7 +5,7 @@ import com.leakyabstractions.result.core.Results; import de.kentoj.kencommandapi.api.argument.CommandArgument; import de.kentoj.kencommandapi.api.invocation.CommandContext; import de.kentoj.kencommandapi.api.invocation.CommandExecutor; -import de.kentoj.kencommandapi.api.node.CommandNode; +import de.kentoj.kencommandapi.api.literal.Literal; import de.kentoj.kencommandapi.api.platform.MessageStyle; import de.kentoj.kencommandapi.type.OfflinePlayerArgumentType; import de.kentoj.scrow.bukkit.ScrowAPI; @@ -19,7 +19,7 @@ import java.util.concurrent.CompletableFuture; public class CoinsGetLiteral implements CommandExecutor { @Getter - private final CommandNode literal; + private final Literal literal; private final MessageStyle style; private final CommandArgument playerArg; @@ -30,7 +30,7 @@ public class CoinsGetLiteral implements CommandExecutor { playerArg = CommandArgument.arg("player", OfflinePlayerArgumentType.getInstance()); playerArg.setDefaultValueProvider(sender -> (OfflinePlayer) sender); - literal = CommandNode.node("get"); + literal = Literal.literal("get"); literal.addArgument(playerArg); literal.setExecutor(this); } diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsSetLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsSetLiteral.java index f7306f3..2adb899 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsSetLiteral.java +++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsSetLiteral.java @@ -6,7 +6,7 @@ import de.kentoj.kencommandapi.api.argument.CommandArgument; import de.kentoj.kencommandapi.api.argument.types.IntegerArgumentType; import de.kentoj.kencommandapi.api.invocation.CommandContext; import de.kentoj.kencommandapi.api.invocation.CommandExecutor; -import de.kentoj.kencommandapi.api.node.CommandNode; +import de.kentoj.kencommandapi.api.literal.Literal; import de.kentoj.kencommandapi.api.platform.MessageStyle; import de.kentoj.kencommandapi.type.OfflinePlayerArgumentType; import de.kentoj.scrow.bukkit.ScrowAPI; @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; public class CoinsSetLiteral implements CommandExecutor { @Getter - private final CommandNode literal; + private final Literal literal; private final MessageStyle style; private final CommandArgument playerArg; @@ -32,7 +32,7 @@ public class CoinsSetLiteral implements CommandExecutor { playerArg = CommandArgument.arg("player", OfflinePlayerArgumentType.getInstance()); amountArg = CommandArgument.arg("amount", new IntegerArgumentType<>()); - literal = CommandNode.node("set"); + literal = Literal.literal("set"); literal.addArgument(playerArg); literal.addArgument(amountArg); literal.setExecutor(this); diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendAddLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendAddLiteral.java index a642697..baf0ad3 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendAddLiteral.java +++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendAddLiteral.java @@ -5,7 +5,7 @@ import com.leakyabstractions.result.core.Results; import de.kentoj.kencommandapi.api.argument.CommandArgument; import de.kentoj.kencommandapi.api.invocation.CommandContext; import de.kentoj.kencommandapi.api.invocation.CommandExecutor; -import de.kentoj.kencommandapi.api.node.CommandNode; +import de.kentoj.kencommandapi.api.literal.Literal; import de.kentoj.kencommandapi.type.OfflinePlayerArgumentType; import de.kentoj.scrow.bukkit.ScrowAPI; import de.kentoj.scrowlib.friends.FriendRequestService; @@ -31,7 +31,7 @@ import java.util.concurrent.CompletableFuture; public class FriendAddLiteral implements CommandExecutor { @Getter - private final CommandNode literal; + private final Literal literal; private final CommandArgument playerArg; private final ScrowMessageStyle style; private final FriendRequestService requestService = ScrowAPI.getFriendRequestService(); @@ -40,7 +40,7 @@ public class FriendAddLiteral implements CommandExecutor { public FriendAddLiteral(ScrowMessageStyle style) { this.style = style; playerArg = CommandArgument.arg("player", OfflinePlayerArgumentType.getInstance()); - literal = CommandNode.node("add"); + literal = Literal.literal("add"); literal.addArgument(playerArg); literal.setExecutor(this); } diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendCommand.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendCommand.java index 500bcc9..2f8af5f 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendCommand.java +++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendCommand.java @@ -1,7 +1,7 @@ package de.kentoj.scrow.bukkit.command.friends; -import de.kentoj.kencommandapi.api.node.CommandNode; -import de.kentoj.kencommandapi.api.node.RootCommandNode; +import de.kentoj.kencommandapi.api.literal.Literal; +import de.kentoj.kencommandapi.api.literal.RootLiteral; import de.kentoj.scrowlib.convention.ScrowMessageStyle; import lombok.AccessLevel; import lombok.NoArgsConstructor; @@ -13,15 +13,15 @@ import org.bukkit.command.CommandSender; @NoArgsConstructor(access = AccessLevel.NONE) public class FriendCommand { - public static RootCommandNode create() { + public static RootLiteral create() { var style = new ScrowMessageStyle("Friends", NamedTextColor.AQUA); - RootCommandNode rootNode = CommandNode.rootNode(style, "f", "friend"); - rootNode.addLiteral(new FriendListLiteral(style).getLiteral()); - rootNode.addLiteral(new FriendAddLiteral(style).getLiteral()); - rootNode.addLiteral(new FriendRemoveLiteral(style).getLiteral()); - rootNode.addLiteral(new FriendRequestDeclineLiteral(style).getLiteral()); - rootNode.addLiteral(new FriendRequestsLiteral(style).getLiteral()); - return rootNode; + RootLiteral rootLiteral = Literal.rootLiteral(style, "f", "friend"); + rootLiteral.addLiteral(new FriendListLiteral(style).getLiteral()); + rootLiteral.addLiteral(new FriendAddLiteral(style).getLiteral()); + rootLiteral.addLiteral(new FriendRemoveLiteral(style).getLiteral()); + rootLiteral.addLiteral(new FriendRequestDeclineLiteral(style).getLiteral()); + rootLiteral.addLiteral(new FriendRequestsLiteral(style).getLiteral()); + return rootLiteral; } public static Component friendRequestOptions(String requestSenderName, boolean runInstantly) { diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendListLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendListLiteral.java index f514ea9..301a062 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendListLiteral.java +++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendListLiteral.java @@ -4,7 +4,7 @@ import com.leakyabstractions.result.api.Result; import com.leakyabstractions.result.core.Results; import de.kentoj.kencommandapi.api.invocation.CommandContext; import de.kentoj.kencommandapi.api.invocation.CommandExecutor; -import de.kentoj.kencommandapi.api.node.CommandNode; +import de.kentoj.kencommandapi.api.literal.Literal; import de.kentoj.scrow.bukkit.ScrowAPI; import de.kentoj.scrow.bukkit.scheduler.Tasks; import de.kentoj.scrowlib.convention.ScrowMessageStyle; @@ -26,12 +26,12 @@ import static net.kyori.adventure.text.Component.text; public class FriendListLiteral implements CommandExecutor { @Getter - private final CommandNode literal; + private final Literal literal; private final ScrowMessageStyle style; public FriendListLiteral(ScrowMessageStyle style) { this.style = style; - this.literal = CommandNode.node("list"); + this.literal = Literal.literal("list"); literal.setExecutor(this); } diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRemoveLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRemoveLiteral.java index 44f7125..090715c 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRemoveLiteral.java +++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRemoveLiteral.java @@ -5,7 +5,7 @@ import com.leakyabstractions.result.core.Results; import de.kentoj.kencommandapi.api.argument.CommandArgument; import de.kentoj.kencommandapi.api.invocation.CommandContext; import de.kentoj.kencommandapi.api.invocation.CommandExecutor; -import de.kentoj.kencommandapi.api.node.CommandNode; +import de.kentoj.kencommandapi.api.literal.Literal; import de.kentoj.kencommandapi.type.OfflinePlayerArgumentType; import de.kentoj.scrow.bukkit.ScrowAPI; import de.kentoj.scrow.bukkit.scheduler.Tasks; @@ -19,14 +19,14 @@ import java.util.concurrent.CompletableFuture; public class FriendRemoveLiteral implements CommandExecutor { @Getter - private final CommandNode literal; + private final Literal literal; private final CommandArgument playerArg; private final ScrowMessageStyle style; public FriendRemoveLiteral(ScrowMessageStyle style) { this.style = style; this.playerArg = CommandArgument.arg("player", OfflinePlayerArgumentType.getInstance()); - this.literal = CommandNode.node("remove"); + this.literal = Literal.literal("remove"); this.literal.addArgument(playerArg); this.literal.setExecutor(this); } diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRequestDeclineLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRequestDeclineLiteral.java index 4f9883d..d3b82fd 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRequestDeclineLiteral.java +++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/friends/FriendRequestDeclineLiteral.java @@ -5,7 +5,7 @@ import com.leakyabstractions.result.core.Results; import de.kentoj.kencommandapi.api.argument.CommandArgument; import de.kentoj.kencommandapi.api.invocation.CommandContext; import de.kentoj.kencommandapi.api.invocation.CommandExecutor; -import de.kentoj.kencommandapi.api.node.CommandNode; +import de.kentoj.kencommandapi.api.literal.Literal; import de.kentoj.kencommandapi.type.OfflinePlayerArgumentType; import de.kentoj.scrow.bukkit.ScrowAPI; import de.kentoj.scrowlib.friends.FriendRequestService; @@ -23,7 +23,7 @@ import java.util.concurrent.CompletableFuture; public class FriendRequestDeclineLiteral implements CommandExecutor { @Getter - private final CommandNode literal; + private final Literal literal; private final CommandArgument playerArg; private final ScrowMessageStyle style; private final FriendRequestService requestService = ScrowAPI.getFriendRequestService(); @@ -31,7 +31,7 @@ public class FriendRequestDeclineLiteral implements CommandExecutor { @Getter - private final CommandNode literal; + private final Literal literal; private final ScrowMessageStyle style; public FriendRequestsLiteral(ScrowMessageStyle style) { this.style = style; - literal = CommandNode.node("requests"); + literal = Literal.literal("requests"); literal.setExecutor(this); } diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceCommand.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceCommand.java index f5a5f9b..5103e9e 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceCommand.java +++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceCommand.java @@ -1,7 +1,7 @@ package de.kentoj.scrow.bukkit.command.instance; -import de.kentoj.kencommandapi.api.node.CommandNode; -import de.kentoj.kencommandapi.api.node.RootCommandNode; +import de.kentoj.kencommandapi.api.literal.Literal; +import de.kentoj.kencommandapi.api.literal.RootLiteral; import de.kentoj.scrowlib.convention.ScrowMessageStyle; import lombok.AccessLevel; import lombok.NoArgsConstructor; @@ -10,12 +10,12 @@ import org.bukkit.command.CommandSender; @NoArgsConstructor(access = AccessLevel.NONE) public class InstanceCommand { - public static RootCommandNode create(InstanceCache instanceCache) { + public static RootLiteral create(InstanceCache instanceCache) { var style = new ScrowMessageStyle("server-manager", NamedTextColor.RED); - RootCommandNode rootNode = CommandNode.rootNode(style, "instance", "server-manager"); - rootNode.addLiteral(new InstanceListLiteral(style).getNode()); - rootNode.addLiteral(new InstanceDeployLiteral(style).getLiteral()); - rootNode.addLiteral(new InstanceDestroyLiteral(instanceCache, style).getLiteral()); - return rootNode; + RootLiteral rootLiteral = Literal.rootLiteral(style, "instance", "server-manager"); + rootLiteral.addLiteral(new InstanceListLiteral(style).getNode()); + rootLiteral.addLiteral(new InstanceDeployLiteral(style).getLiteral()); + rootLiteral.addLiteral(new InstanceDestroyLiteral(instanceCache, style).getLiteral()); + return rootLiteral; } } diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceDeployLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceDeployLiteral.java index 0a36636..50d0f95 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceDeployLiteral.java +++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceDeployLiteral.java @@ -6,7 +6,7 @@ import de.kentoj.kencommandapi.api.argument.CommandArgument; import de.kentoj.kencommandapi.api.argument.types.StringArgumentType; import de.kentoj.kencommandapi.api.invocation.CommandContext; import de.kentoj.kencommandapi.api.invocation.CommandExecutor; -import de.kentoj.kencommandapi.api.node.CommandNode; +import de.kentoj.kencommandapi.api.literal.Literal; import de.kentoj.scrow.bukkit.ScrowAPI; import de.kentoj.scrow.bukkit.scheduler.Tasks; import de.kentoj.scrowlib.convention.ScrowMessageStyle; @@ -18,7 +18,7 @@ import java.util.concurrent.CompletableFuture; public class InstanceDeployLiteral implements CommandExecutor { @Getter - private final CommandNode literal; + private final Literal literal; private final CommandArgument templateArg; private final ScrowMessageStyle style; @@ -27,7 +27,7 @@ public class InstanceDeployLiteral implements CommandExecutor { templateArg = CommandArgument.arg("template", new StringArgumentType<>()); - literal = CommandNode.node("deploy"); + literal = Literal.literal("deploy"); literal.addArgument(templateArg); literal.setExecutor(this); } diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceDestroyLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceDestroyLiteral.java index b9125df..f21e132 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceDestroyLiteral.java +++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceDestroyLiteral.java @@ -6,7 +6,7 @@ import de.kentoj.kencommandapi.api.argument.CommandArgument; import de.kentoj.kencommandapi.api.argument.types.StringArgumentType; import de.kentoj.kencommandapi.api.invocation.CommandContext; import de.kentoj.kencommandapi.api.invocation.CommandExecutor; -import de.kentoj.kencommandapi.api.node.CommandNode; +import de.kentoj.kencommandapi.api.literal.Literal; import de.kentoj.scrow.bukkit.ScrowAPI; import de.kentoj.scrow.bukkit.scheduler.Tasks; import de.kentoj.scrowlib.convention.ScrowMessageStyle; @@ -19,7 +19,7 @@ import java.util.concurrent.CompletableFuture; public class InstanceDestroyLiteral implements CommandExecutor { @Getter - private final CommandNode literal; + private final Literal literal; private final CommandArgument handleArg; private final ScrowMessageStyle style; @@ -30,7 +30,7 @@ public class InstanceDestroyLiteral implements CommandExecutor { handleArg.setSuggestionProvider(ctx -> cache.getInstances().stream() .map(ServerInstance::getHandle) .toList()); - literal = CommandNode.node("destroy"); + literal = Literal.literal("destroy"); literal.addArgument(handleArg); literal.setExecutor(this); } diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceListLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceListLiteral.java index bc2a42e..aa5b54b 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceListLiteral.java +++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/InstanceListLiteral.java @@ -4,7 +4,7 @@ import com.leakyabstractions.result.api.Result; import com.leakyabstractions.result.core.Results; import de.kentoj.kencommandapi.api.invocation.CommandContext; import de.kentoj.kencommandapi.api.invocation.CommandExecutor; -import de.kentoj.kencommandapi.api.node.CommandNode; +import de.kentoj.kencommandapi.api.literal.Literal; import de.kentoj.scrow.bukkit.ScrowAPI; import de.kentoj.scrow.bukkit.scheduler.Tasks; import de.kentoj.scrowlib.convention.ScrowMessageStyle; @@ -17,12 +17,12 @@ import java.util.concurrent.CompletableFuture; public class InstanceListLiteral implements CommandExecutor { @Getter - private final CommandNode node; + private final Literal node; private final ScrowMessageStyle style; public InstanceListLiteral(ScrowMessageStyle style) { this.style = style; - this.node = CommandNode.node("list"); + this.node = Literal.literal("list"); this.node.setExecutor(this); } diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/LobbyCommand.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/LobbyCommand.java index ec0d537..17e5e0d 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/LobbyCommand.java +++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/LobbyCommand.java @@ -4,8 +4,8 @@ import com.leakyabstractions.result.api.Result; import com.leakyabstractions.result.core.Results; import de.kentoj.kencommandapi.api.invocation.CommandContext; import de.kentoj.kencommandapi.api.invocation.SyncCommandExecutor; -import de.kentoj.kencommandapi.api.node.CommandNode; -import de.kentoj.kencommandapi.api.node.RootCommandNode; +import de.kentoj.kencommandapi.api.literal.Literal; +import de.kentoj.kencommandapi.api.literal.RootLiteral; import de.kentoj.kencommandapi.api.platform.MessageStyle; import lombok.Getter; import org.bukkit.Bukkit; @@ -14,11 +14,11 @@ import org.bukkit.command.CommandSender; public class LobbyCommand implements SyncCommandExecutor { @Getter - private final RootCommandNode rootNode; + private final RootLiteral rootLiteral; public LobbyCommand() { - this.rootNode = CommandNode.rootNode(MessageStyle.PLAIN, "lobby", "l", "hub"); - this.rootNode.setExecutor(this); + this.rootLiteral = Literal.rootLiteral(MessageStyle.PLAIN, "lobby", "l", "hub"); + this.rootLiteral.setExecutor(this); } @Override diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/PlayCommand.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/PlayCommand.java index a89845c..b720ec2 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/PlayCommand.java +++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/instance/PlayCommand.java @@ -6,8 +6,8 @@ import de.kentoj.kencommandapi.api.argument.CommandArgument; import de.kentoj.kencommandapi.api.argument.types.StringArgumentType; import de.kentoj.kencommandapi.api.invocation.CommandContext; import de.kentoj.kencommandapi.api.invocation.CommandExecutor; -import de.kentoj.kencommandapi.api.node.CommandNode; -import de.kentoj.kencommandapi.api.node.RootCommandNode; +import de.kentoj.kencommandapi.api.literal.Literal; +import de.kentoj.kencommandapi.api.literal.RootLiteral; import de.kentoj.scrow.bukkit.ScrowAPI; import de.kentoj.scrow.bukkit.scheduler.Tasks; import de.kentoj.scrowlib.convention.ScrowMessageStyle; @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; public class PlayCommand implements CommandExecutor { @Getter - private final RootCommandNode rootNode; + private final RootLiteral rootLiteral; private final CommandArgument gamemodeArg; public PlayCommand() { @@ -28,9 +28,9 @@ public class PlayCommand implements CommandExecutor { gamemodeArg = CommandArgument.arg("gamemode", new StringArgumentType<>()); - rootNode = CommandNode.rootNode(style, "play", "queue"); - rootNode.addArgument(this.gamemodeArg); - rootNode.setExecutor(this); + rootLiteral = Literal.rootLiteral(style, "play", "queue"); + rootLiteral.addArgument(this.gamemodeArg); + rootLiteral.setExecutor(this); } @Override diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/listener/ChatStyleListener.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/listener/ChatStyleListener.java index 947cee7..7cb2ab2 100644 --- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/listener/ChatStyleListener.java +++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/listener/ChatStyleListener.java @@ -8,6 +8,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; public class ChatStyleListener implements Listener { + @EventHandler public void onChat(AsyncChatEvent event) { Player player = event.getPlayer(); diff --git a/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/CoreVelocityPlugin.java b/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/CoreVelocityPlugin.java index c859c12..6b87f2e 100644 --- a/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/CoreVelocityPlugin.java +++ b/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/CoreVelocityPlugin.java @@ -33,9 +33,9 @@ public class CoreVelocityPlugin { var lastTargetCache = new LastTargetCache(); var style = new ScrowMessageStyle("MSG", NamedTextColor.LIGHT_PURPLE); var privmsgHelper = new PrivMsgHandler(style); - cmds.register(new ReplyCommand(server, lastTargetCache, privmsgHelper, style).getRootNode()); - cmds.register(new MsgCommand(server, lastTargetCache, privmsgHelper, style).getRootNode()); - cmds.register(new OnlineCommand(server).getRootNode()); + cmds.register(new ReplyCommand(server, lastTargetCache, privmsgHelper, style).getRootLiteral()); + cmds.register(new MsgCommand(server, lastTargetCache, privmsgHelper, style).getRootLiteral()); + cmds.register(new OnlineCommand(server).getRootLiteral()); } var registerWatchdog = new ServerRegisterWatchdog(server); diff --git a/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/command/OnlineCommand.java b/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/command/OnlineCommand.java index 2cac603..ac2acdc 100644 --- a/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/command/OnlineCommand.java +++ b/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/command/OnlineCommand.java @@ -6,8 +6,8 @@ import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.ProxyServer; import de.kentoj.kencommandapi.api.invocation.CommandContext; import de.kentoj.kencommandapi.api.invocation.SyncCommandExecutor; -import de.kentoj.kencommandapi.api.node.CommandNode; -import de.kentoj.kencommandapi.api.node.RootCommandNode; +import de.kentoj.kencommandapi.api.literal.Literal; +import de.kentoj.kencommandapi.api.literal.RootLiteral; import de.kentoj.scrowlib.convention.ScrowMessageStyle; import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -16,14 +16,14 @@ import lombok.RequiredArgsConstructor; public class OnlineCommand implements SyncCommandExecutor { @Getter - private final RootCommandNode rootNode; + private final RootLiteral rootLiteral; private final ScrowMessageStyle style = ScrowMessageStyle.GENERIC; private final ProxyServer server; public OnlineCommand(ProxyServer server) { this.server = server; - rootNode = CommandNode.rootNode(ScrowMessageStyle.GENERIC, "online"); - rootNode.setExecutor(this); + rootLiteral = Literal.rootLiteral(ScrowMessageStyle.GENERIC, "online"); + rootLiteral.setExecutor(this); } @Override diff --git a/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/privmsg/MsgCommand.java b/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/privmsg/MsgCommand.java index 08f7cb8..591ed6d 100644 --- a/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/privmsg/MsgCommand.java +++ b/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/privmsg/MsgCommand.java @@ -9,8 +9,8 @@ import de.kentoj.kencommandapi.api.argument.CommandArgument; import de.kentoj.kencommandapi.api.argument.types.StringArgumentType; import de.kentoj.kencommandapi.api.invocation.CommandContext; import de.kentoj.kencommandapi.api.invocation.SyncCommandExecutor; -import de.kentoj.kencommandapi.api.node.CommandNode; -import de.kentoj.kencommandapi.api.node.RootCommandNode; +import de.kentoj.kencommandapi.api.literal.Literal; +import de.kentoj.kencommandapi.api.literal.RootLiteral; import de.kentoj.kencommandapi.api.platform.MessageStyle; import de.kentoj.kencommandapi.type.PlayerArgumentType; import lombok.Getter; @@ -18,7 +18,7 @@ import lombok.Getter; public class MsgCommand implements SyncCommandExecutor { @Getter - private final RootCommandNode rootNode; + private final RootLiteral rootLiteral; private final CommandArgument targetArg; private final CommandArgument msgArg; @@ -32,10 +32,10 @@ public class MsgCommand implements SyncCommandExecutor { targetArg = CommandArgument.arg("target", new PlayerArgumentType(server)); msgArg = CommandArgument.arg("msg", new StringArgumentType<>(true)); - rootNode = CommandNode.rootNode(style, "msg", "w", "privmsg"); - rootNode.setExecutor(this); - rootNode.addArgument(targetArg); - rootNode.addArgument(msgArg); + rootLiteral = Literal.rootLiteral(style, "msg", "w", "privmsg"); + rootLiteral.setExecutor(this); + rootLiteral.addArgument(targetArg); + rootLiteral.addArgument(msgArg); } @Override diff --git a/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/privmsg/ReplyCommand.java b/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/privmsg/ReplyCommand.java index def084c..4455ab2 100644 --- a/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/privmsg/ReplyCommand.java +++ b/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/privmsg/ReplyCommand.java @@ -9,15 +9,15 @@ import de.kentoj.kencommandapi.api.argument.CommandArgument; import de.kentoj.kencommandapi.api.argument.types.StringArgumentType; import de.kentoj.kencommandapi.api.invocation.CommandContext; import de.kentoj.kencommandapi.api.invocation.SyncCommandExecutor; -import de.kentoj.kencommandapi.api.node.CommandNode; -import de.kentoj.kencommandapi.api.node.RootCommandNode; +import de.kentoj.kencommandapi.api.literal.Literal; +import de.kentoj.kencommandapi.api.literal.RootLiteral; import de.kentoj.kencommandapi.api.platform.MessageStyle; import lombok.Getter; public class ReplyCommand implements SyncCommandExecutor { @Getter - private final RootCommandNode rootNode; + private final RootLiteral rootLiteral; private final CommandArgument msgArg; private final LastTargetCache cache; @@ -30,9 +30,9 @@ public class ReplyCommand implements SyncCommandExecutor { this.privMsgHandler = privMsgHandler; msgArg = CommandArgument.arg("msg", new StringArgumentType<>(true)); - rootNode = CommandNode.rootNode(style, "reply", "r"); - rootNode.setExecutor(this); - rootNode.addArgument(msgArg); + rootLiteral = Literal.rootLiteral(style, "reply", "r"); + rootLiteral.setExecutor(this); + rootLiteral.addArgument(msgArg); } @Override diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6d98f84..149e697 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] shadow = "9.2.0" run-paper = "2.3.1" -scrow-commandapi = "0.32" +scrow-commandapi = "0.33-SNAPSHOT" postgress = "42.7.12" nats = "2.25.2" papermc = "1.21.11-rc3-R0.1-SNAPSHOT"