From c308769e6d853b6cf290fb0a3c3f85575a0f9be6 Mon Sep 17 00:00:00 2001 From: PiggyPiglet Date: Fri, 30 Jan 2026 17:41:13 +0800 Subject: [PATCH] remove unused code --- .../commands/PlaceholderCommandRouter.java | 116 ------------------ .../commands/impl/local/CommandParse.java | 37 +----- 2 files changed, 2 insertions(+), 151 deletions(-) diff --git a/src/main/java/at/helpch/placeholderapi/commands/PlaceholderCommandRouter.java b/src/main/java/at/helpch/placeholderapi/commands/PlaceholderCommandRouter.java index 605e03c..bff043b 100644 --- a/src/main/java/at/helpch/placeholderapi/commands/PlaceholderCommandRouter.java +++ b/src/main/java/at/helpch/placeholderapi/commands/PlaceholderCommandRouter.java @@ -85,51 +85,6 @@ public final class PlaceholderCommandRouter extends AbstractCommand { this.commands = commands; } - - -// @Override -// @NotNull -// public CompletableFuture acceptCall(@NotNull final CommandSender sender, @NotNull final ParserContext parserContext, -// @NotNull final ParseResult parseResult) { -//// if (sender instanceof Player || sender instanceof PlayerRef) { -//// return CompletableFuture.completedFuture(null); -//// } -// -// final String[] args = parserContext.getInputString().replace("papi ", "").split(" "); -// -// if (args.length == 0) { -// final PlaceholderCommand fallback = commands.get("version"); -// if (fallback != null) { -// fallback.evaluate(plugin, sender, "", Collections.emptyList()); -// } -// -// return CompletableFuture.completedFuture(null); -// } -// -// final String search = args[0].toLowerCase(Locale.ROOT); -// final PlaceholderCommand target = commands.get(search); -// -// if (target == null) { -// sender.sendMessage(Message.raw("Unknown command ").color(Color.RED).insert(Message.raw(search).color(Color.GRAY))); -// -//// Msg.msg(sender, "&cUnknown command &7" + search); -// return CompletableFuture.completedFuture(null); -// } -// -// final String permission = target.getPermission(); -// if (permission != null && !permission.isEmpty() && !sender.hasPermission(permission)) { -// sender.sendMessage(Message.raw("You do not have permission to do this!").color(Color.RED)); -// -//// Msg.msg(sender, "&cYou do not have permission to do this!"); -// return CompletableFuture.completedFuture(null); -// } -// -// target -// .evaluate(plugin, sender, search, Arrays.asList(Arrays.copyOfRange(args, 1, args.length))); -// -// return CompletableFuture.completedFuture(null); -// } - @Override protected @Nullable CompletableFuture execute(@NotNull final CommandContext context) { final String[] args = context.getInputString().replace("papi", "").replace("placeholderapi", "").trim().split(" "); @@ -150,7 +105,6 @@ public final class PlaceholderCommandRouter extends AbstractCommand { if (target == null) { sender.sendMessage(Message.raw("Unknown command ").color(Color.RED).insert(Message.raw(search).color(Color.GRAY))); -// Msg.msg(sender, "&cUnknown command &7" + search); return CompletableFuture.completedFuture(null); } @@ -158,7 +112,6 @@ public final class PlaceholderCommandRouter extends AbstractCommand { if (permission != null && !permission.isEmpty() && !sender.hasPermission(permission)) { sender.sendMessage(Message.raw("You do not have permission to do this!").color(Color.RED)); -// Msg.msg(sender, "&cYou do not have permission to do this!"); return CompletableFuture.completedFuture(null); } @@ -168,73 +121,4 @@ public final class PlaceholderCommandRouter extends AbstractCommand { return CompletableFuture.completedFuture(null); } -// @Override -// protected void execute(@NotNull final CommandContext context, @NotNull final Store var2, @NotNull final Ref var3, @NotNull final PlayerRef var4, @NotNull final World var5) { -// final String[] args = context.getInputString().replace("papi ", "").split(" "); -// final CommandSender sender = context.sender(); -// -// if (args.length == 0) { -// final PlaceholderCommand fallback = commands.get("version"); -// if (fallback != null) { -// fallback.evaluate(plugin, sender, "", Collections.emptyList()); -// } -// -// return; -// } -// -// final String search = args[0].toLowerCase(Locale.ROOT); -// final PlaceholderCommand target = commands.get(search); -// -// if (target == null) { -// sender.sendMessage(Message.raw("Unknown command ").color(Color.RED).insert(Message.raw(search).color(Color.GRAY))); -// -//// Msg.msg(sender, "&cUnknown command &7" + search); -// return; -// } -// -// final String permission = target.getPermission(); -// if (permission != null && !permission.isEmpty() && !sender.hasPermission(permission)) { -// sender.sendMessage(Message.raw("You do not have permission to do this!").color(Color.RED)); -// -//// Msg.msg(sender, "&cYou do not have permission to do this!"); -// return; -// } -// -// target -// .evaluate(plugin, sender, search, Arrays.asList(Arrays.copyOfRange(args, 1, args.length))); -// -// return; -// } - - -// @Override -// @Nullable -// protected CompletableFuture execute(@NotNull final CommandContext commandContext) { -// return null; -// } - -// @Override -// public List onTabComplete(@NotNull final CommandSender sender, -// @NotNull final Command command, @NotNull final String alias, @NotNull final String[] args) { -// final List suggestions = new ArrayList<>(); -// -// if (args.length > 1) { -// final PlaceholderCommand target = this.commands.get(args[0].toLowerCase(Locale.ROOT)); -// -// if (target != null) { -// target.complete(plugin, sender, args[0].toLowerCase(Locale.ROOT), -// Arrays.asList(Arrays.copyOfRange(args, 1, args.length)), suggestions); -// } -// -// return suggestions; -// } -// -// final Stream targets = PlaceholderCommand -// .filterByPermission(sender, commands.values().stream()).map(PlaceholderCommand::getLabels) -// .flatMap(Collection::stream); -// PlaceholderCommand.suggestByParameter(targets, suggestions, args.length == 0 ? null : args[0]); -// -// return suggestions; -// } - } diff --git a/src/main/java/at/helpch/placeholderapi/commands/impl/local/CommandParse.java b/src/main/java/at/helpch/placeholderapi/commands/impl/local/CommandParse.java index 43d60af..139a842 100644 --- a/src/main/java/at/helpch/placeholderapi/commands/impl/local/CommandParse.java +++ b/src/main/java/at/helpch/placeholderapi/commands/impl/local/CommandParse.java @@ -86,23 +86,6 @@ public final class CommandParse extends PlaceholderCommand { } } -// @Override -// public void complete(@NotNull final PlaceholderAPIBootstrap plugin, -// @NotNull final CommandSender sender, @NotNull final String alias, -// @NotNull @Unmodifiable final List params, @NotNull final List suggestions) { -// switch (alias.toLowerCase(Locale.ROOT)) { -// case "parserel": -// completeParseRelation(params, suggestions); -// break; -// case "parse": -// case "bcparse": -// case "cmdparse": -// completeParseSingular(sender, params, suggestions); -// break; -// } -// } - - private void evaluateParseSingular(@NotNull final CommandSender sender, @NotNull @Unmodifiable final List params, final boolean broadcast, final boolean command) { @@ -112,10 +95,6 @@ public final class CommandParse extends PlaceholderCommand { .insert(Message.raw(command ? "cmdparse" : (broadcast ? "bcparse" : "parse")).color(Color.CYAN)) .insert(Message.raw(" {target}").color(Color.GRAY)) .insert(Message.raw(" {message}").color(Color.GREEN))); -// Msg.msg(sender, -// "&cYou must provide a target and message: &b/papi " -// + (command ? "cmdparse" : (broadcast ? "bcparse" : "parse")) -// + " &7{target} &a{message}"); return; } @@ -124,7 +103,6 @@ public final class CommandParse extends PlaceholderCommand { if ("me".equalsIgnoreCase(params.getFirst())) { if (!(sender instanceof Player) && !(sender instanceof PlayerRef)) { sender.sendMessage(Message.raw("You must be a player to use ").color(Color.RED).insert(Message.raw("me").color(Color.GRAY)).insert(Message.raw(" as a target!").color(Color.RED))); -// Msg.msg(sender, "&cYou must be a player to use &7me&c as a target!"); return; } @@ -139,7 +117,6 @@ public final class CommandParse extends PlaceholderCommand { final PlayerRef target = resolvePlayer(params.get(0)); if (target == null) { sender.sendMessage(Message.raw("Failed to find player: ").color(Color.RED).insert(Message.raw(params.get(0)).color(Color.WHITE))); -// Msg.msg(sender, "&cFailed to find player: &7" + params.get(0)); return; } @@ -151,13 +128,11 @@ public final class CommandParse extends PlaceholderCommand { if (command) { sender.sendMessage(Message.raw("To be implemented")); // todo: implement -// Bukkit.dispatchCommand(sender, message); return; } if (broadcast) { Universe.get().sendMessage(Message.raw(message)); -// Bukkit.broadcastMessage(message); } else { sender.sendMessage(Message.raw(message)); } @@ -170,9 +145,6 @@ public final class CommandParse extends PlaceholderCommand { .insert(Message.raw("/papi parserel ").color(Color.CYAN)) .insert(Message.raw("{target one} {target two} ").color(Color.GRAY)) .insert(Message.raw("{message}").color(Color.GREEN))); -// Msg.msg(sender, -// "&cYou must supply two targets, and a message: &b/papi parserel &7{target one} " -// + "{target two} &a{message}"); return; } @@ -183,7 +155,6 @@ public final class CommandParse extends PlaceholderCommand { sender.sendMessage(Message.raw("You must be a player to use ").color(Color.RED) .insert(Message.raw("me").color(Color.GRAY)) .insert(Message.raw(" as a target!").color(Color.RED))); -// Msg.msg(sender, "&cYou must be a player to use &7me&c as a target!"); return; } @@ -196,9 +167,8 @@ public final class CommandParse extends PlaceholderCommand { playerOne = resolvePlayer(params.get(0)); } - if (playerOne == null/* || !playerOne.isOnline()*/) { + if (playerOne == null) { sender.sendMessage(Message.raw("Failed to find player: ").color(Color.RED).insert(Message.raw(params.get(0)).color(Color.WHITE))); -// Msg.msg(sender, "&cFailed to find player: &f" + params.get(0)); return; } @@ -207,7 +177,6 @@ public final class CommandParse extends PlaceholderCommand { if ("me".equalsIgnoreCase(params.get(1))) { if (!(sender instanceof Player) && !(sender instanceof PlayerRef)) { sender.sendMessage(Message.raw("You must be a player to use ").color(Color.RED).insert(Message.raw("me").color(Color.GRAY)).insert(Message.raw(" as a target!").color(Color.RED))); -// Msg.msg(sender, "&cYou must be a player to use &7me&c as a target!"); return; } @@ -220,9 +189,8 @@ public final class CommandParse extends PlaceholderCommand { playerTwo = resolvePlayer(params.get(1)); } - if (playerTwo == null/* || !playerTwo.isOnline()*/) { + if (playerTwo == null) { sender.sendMessage(Message.raw("Failed to find player: ").color(Color.RED).insert(Message.raw(params.get(1)).color(Color.WHITE))); -// Msg.msg(sender, "&cFailed to find player: &f" + params.get(1)); return; } @@ -247,7 +215,6 @@ public final class CommandParse extends PlaceholderCommand { } final Stream names = Universe.get().getPlayers().stream().map(PlayerRef::getUsername); -// final Stream names = Bukkit.getOnlinePlayers().stream().map(Player::getName); suggestByParameter(names, suggestions, params.isEmpty() ? null : params.get(0)); return;