Repo-Mirror/SakuraMC
9
0
Fork 0
mirror of https://github.com/Samsuik/Sakura.git synced 2025-12-28 19:29:07 +00:00
Code Issues Releases Activity

Fix sakura command tab completion

Browse Source
This commit is contained in:
Samsuik
2025-03-15 17:53:45 +00:00
parent 9844a7a51f
commit 05b7b9c609
2 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
sakura-server/src/main/java/me/samsuik/sakura/command/SakuraCommand.java
View File

@@ -1,5 +1,6 @@
package me.samsuik.sakura.command;
import com.google.common.collect.Iterables;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.minimessage.MiniMessage;
@@ -9,11 +10,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.jspecify.annotations.NullMarked;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.stream.Stream;
import java.util.*;
@NullMarked
public final class SakuraCommand extends Command {
@@ -35,15 +32,8 @@ public final class SakuraCommand extends Command {
@Override
public boolean execute(CommandSender sender, String commandLabel, String[] args) {
if (args.length > 0) {
List<Command> commands = new ArrayList<>(SakuraCommands.SUB_COMMANDS);
// This part is copied from the VersionCommand SubCommand in paper
Command internalVersion = MinecraftServer.getServer().server.getCommandMap().getCommand("version");
if (internalVersion != null) {
commands.add(internalVersion);
}
for (Command base : commands) {
final Command versionCommand = MinecraftServer.getServer().server.getCommandMap().getCommand("version");
for (final Command base : Iterables.concat(SakuraCommands.SUB_COMMANDS, List.of(versionCommand))) {
if (base.getName().equalsIgnoreCase(args[0])) {
return base.execute(sender, commandLabel, Arrays.copyOfRange(args, 1, args.length));
}
@@ -57,27 +47,38 @@ public final class SakuraCommand extends Command {
private void sendHelpMessage(CommandSender sender) {
sender.sendMessage(HEADER_MESSAGE);
Stream<Command> uniqueCommands = SakuraCommands.SUB_COMMANDS
.stream()
.filter(command -> command != this);
uniqueCommands.forEach((command) -> {
sender.sendRichMessage(COMMAND_MSG, Placeholder.unparsed("command", command.getName()));
});
for (final Command command : SakuraCommands.COMMANDS.values()) {
if (command != this) {
sender.sendRichMessage(COMMAND_MSG, Placeholder.unparsed("command", command.getName()));
}
}
sender.sendMessage(Component.text("'", NamedTextColor.DARK_PURPLE));
}
@Override
public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
if (!this.testPermissionSilent(sender)) {
if (!this.testPermissionSilent(sender) || args.length == 0) {
return Collections.emptyList();
}
return SakuraCommands.SUB_COMMANDS.stream()
.filter(command -> command != this)
.map(Command::getName)
.filter(name -> args.length <= 1 || name.startsWith(args[args.length - 1]))
final Command command = SakuraCommands.getCommand(args[0]);
final List<String> completions = new ArrayList<>();
if (command != null && args.length > 1) {
final String[] newArgs = Arrays.copyOfRange(args, 1, args.length);
completions.addAll(command.tabComplete(sender, alias, newArgs));
} else {
for (final Command subCommand : SakuraCommands.SUB_COMMANDS) {
final String commandName = subCommand.getName();
if (commandName.startsWith(args[0])) {
completions.add(commandName);
}
}
}
final String lastArg = args[args.length - 1];
return completions.stream()
.filter(result -> result.startsWith(lastArg))
.toList();
}
}

12
sakura-server/src/main/java/me/samsuik/sakura/command/SakuraCommands.java
View File

@@ -5,6 +5,7 @@ import me.samsuik.sakura.player.visibility.VisibilityTypes;
import net.minecraft.server.MinecraftServer;
import org.bukkit.command.Command;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;
import java.util.HashMap;
import java.util.HashSet;
@@ -17,7 +18,6 @@ public final class SakuraCommands {
static final Set<Command> SUB_COMMANDS = new HashSet<>();
static {
COMMANDS.put("sakura", new SakuraCommand("sakura"));
COMMANDS.put("config", new ConfigCommand("config"));
COMMANDS.put("tps", new TPSCommand("tps"));
COMMANDS.put("fps", new FPSCommand("fps"));
@@ -25,6 +25,8 @@ public final class SakuraCommands {
COMMANDS.put("sandvisibility", new VisualCommand(VisibilityTypes.SAND, "sandtoggle"));
SUB_COMMANDS.addAll(COMMANDS.values());
SUB_COMMANDS.add(new DebugCommand("debug"));
// "sakura" isn't a subcommand
COMMANDS.put("sakura", new SakuraCommand("sakura"));
}
public static void registerCommands(MinecraftServer server) {
@@ -32,4 +34,12 @@ public final class SakuraCommands {
server.server.getCommandMap().register(name, "sakura", command);
});
}
@Nullable
public static Command getCommand(String name) {
return SUB_COMMANDS.stream()
.filter(cmd -> cmd.getName().equalsIgnoreCase(name))
.findFirst()
.orElse(null);
}
}