System-End/Discord-MC-Chat
1
0
Fork 0
mirror of https://github.com/System-End/Discord-MC-Chat.git synced 2026-04-19 19:45:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix console command suggestions

Browse source
This commit is contained in:
Xujiayao 2026-02-26 16:32:19 +08:00
parent 4cfb470919
commit acbdb377c0
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
minecraft/src/main/java/com/xujiayao/discord_mc_chat/minecraft/events/MinecraftEventHandler.java
View file

@ -3,6 +3,7 @@ package com.xujiayao.discord_mc_chat.minecraft.events;
import com.mojang.brigadier.ParseResults;
import com.mojang.brigadier.suggestion.Suggestion;
import com.mojang.brigadier.suggestion.Suggestions;
import com.mojang.brigadier.tree.CommandNode;
import com.xujiayao.discord_mc_chat.DMCC;
import com.xujiayao.discord_mc_chat.commands.impl.StatsCommand;
import com.xujiayao.discord_mc_chat.minecraft.commands.MinecraftCommands;
@ -38,9 +39,11 @@ import java.lang.management.ManagementFactory;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
@ -281,8 +284,23 @@ public class MinecraftEventHandler {
ParseResults<CommandSourceStack> parse = serverInstance.getCommands().getDispatcher().parse(event.input(), source);
try {
Suggestions suggestions = serverInstance.getCommands().getDispatcher().getCompletionSuggestions(parse).get(3, TimeUnit.SECONDS);
Suggestions suggestions = serverInstance.getCommands().getDispatcher()
.getCompletionSuggestions(parse)
.get(3, TimeUnit.SECONDS);
boolean isRootToken = event.input() != null && !event.input().contains(" ");
Set<String> allowedRoot = new HashSet<>();
for (CommandNode<CommandSourceStack> child : serverInstance.getCommands().getDispatcher().getRoot().getChildren()) {
if (!child.getName().isEmpty() && child.canUse(source)) {
allowedRoot.add(child.getName());
}
}
for (Suggestion suggestion : suggestions.getList()) {
if (isRootToken && !allowedRoot.contains(suggestion.getText())) {
continue;
}
event.suggestions().add(suggestion.apply(event.input()));
}
} catch (Exception ignored) {