Finish up Brigadier

This commit is contained in:
2026-05-19 21:07:41 -04:00
parent d58365f93f
commit cf15f33496
54 changed files with 1429 additions and 900 deletions
@@ -2,10 +2,8 @@ package dev.plex.command.impl;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import dev.plex.command.ServerCommand;
import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions;
import dev.plex.command.ServerCommandContext;
import dev.plex.command.exception.CommandFailException;
import dev.plex.command.source.RequiredCommandSource;
import dev.plex.event.GameModeUpdateEvent;
import dev.plex.util.PlexUtils;
@@ -17,30 +15,38 @@ import org.bukkit.GameMode;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@CommandPermissions(permission = "plex.gamemode.creative", source = RequiredCommandSource.ANY)
@CommandParameters(name = "creative", aliases = "gmc,egmc,ecreative,eecreative,creativemode,ecreativemode", description = "Set your own or another player's gamemode to creative mode")
public class CreativeCMD extends ServerCommand
{
public CreativeCMD()
{
super(command("creative")
.description("Set your own or another player's gamemode to creative mode")
.aliases("gmc,egmc,ecreative,eecreative,creativemode,ecreativemode")
.permission("plex.gamemode.creative")
.build());
}
@Override
protected void buildCommand(LiteralArgumentBuilder<CommandSourceStack> command)
{
command.executes(context -> executeCommand(context));
command.then(word("target")
.requires(source -> silentCheckPermission(source.getSender(), "plex.gamemode.creative.others"))
.requires(source -> canUsePermission(source, "plex.gamemode.creative.others"))
.suggests(suggestPlayersAndAll("plex.gamemode.creative.others"))
.executes(context -> executeCommand(context, string(context, "target"))));
}
@Override
protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args)
protected Component execute(@NotNull ServerCommandContext context)
{
CommandSender sender = context.sender();
Player playerSender = context.player();
String[] args = context.args();
if (args.length == 0)
{
if (isConsole(sender))
if (context.isConsole(sender))
{
throw new CommandFailException(messageString("consoleMustDefinePlayer"));
throw new CommandFailException(context.messageString("consoleMustDefinePlayer"));
}
if (!(playerSender == null))
{
@@ -49,19 +55,19 @@ public class CreativeCMD extends ServerCommand
return null;
}
checkPermission(sender, "plex.gamemode.creative.others");
context.checkPermission(sender, "plex.gamemode.creative.others");
if (args[0].equals("-a"))
{
for (Player targetPlayer : Bukkit.getServer().getOnlinePlayers())
{
targetPlayer.setGameMode(GameMode.CREATIVE);
messageComponent("gameModeSetTo", "creative");
context.messageComponent("gameModeSetTo", "creative");
}
PlexUtils.broadcast(messageComponent("setEveryoneGameMode", sender.getName(), "creative"));
PlexUtils.broadcast(context.messageComponent("setEveryoneGameMode", sender.getName(), "creative"));
return null;
}
Player nPlayer = getNonNullPlayer(args[0]);
Player nPlayer = context.getNonNullPlayer(args[0]);
Bukkit.getServer().getPluginManager().callEvent(new GameModeUpdateEvent(sender, nPlayer, GameMode.CREATIVE));
return null;
}