Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-06-27 23:15:04 +02:00
Code Issues Projects Releases Wiki Activity

Fixed CommandProcessor commands, allow to disable writing tracking

Browse Source
This commit is contained in:
Felix Cravic 2020-08-04 06:28:21 +02:00
parent aecf0f427a
commit 981d247f02
3 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/fr/themode/demo/commands/SimpleCommand.java
View File

@ -75,6 +75,11 @@ public class SimpleCommand implements CommandProcessor {
return true;
}
@Override
public boolean enableWritingTracking() {
return true;
}
@Override
public String[] onWrite(String text) {
return new String[]{"Complete1", "Complete2"};

23
src/main/java/net/minestom/server/command/CommandManager.java
View File

@ -21,6 +21,7 @@ import net.minestom.server.event.player.PlayerCommandEvent;
import net.minestom.server.network.packet.server.play.DeclareCommandsPacket;
import net.minestom.server.utils.ArrayUtils;
import net.minestom.server.utils.validate.Check;
import org.apache.commons.lang3.tuple.Pair;
import java.util.*;
import java.util.function.Consumer;
@ -211,38 +212,44 @@ public class CommandManager {
}
final List<String> simpleCommands = new ArrayList<>();
// Pair<CommandName,EnabledTracking>
final List<Pair<String, Boolean>> commandsPair = new ArrayList<>();
for (CommandProcessor commandProcessor : commandProcessorMap.values()) {
final boolean enableTracking = commandProcessor.enableWritingTracking();
// Do not show command if return false
if (!commandProcessor.hasAccess(player))
continue;
simpleCommands.add(commandProcessor.getCommandName());
commandsPair.add(Pair.of(commandProcessor.getCommandName(), enableTracking));
final String[] aliases = commandProcessor.getAliases();
if (aliases == null || aliases.length == 0)
continue;
for (String alias : aliases) {
simpleCommands.add(alias);
commandsPair.add(Pair.of(alias, enableTracking));
}
}
for (String simpleCommand : simpleCommands) {
for (Pair<String, Boolean> pair : commandsPair) {
final String name = pair.getLeft();
final boolean tracking = pair.getRight();
// Server suggestion (ask_server)
{
DeclareCommandsPacket.Node tabNode = new DeclareCommandsPacket.Node();
tabNode.flags = getFlag(NodeType.ARGUMENT, true, true, true);
tabNode.name = "tab_completion";
tabNode.flags = getFlag(NodeType.ARGUMENT, true, false, tracking);
tabNode.name = tracking ? "tab_completion" : "args";
tabNode.parser = "brigadier:string";
tabNode.properties = packetWriter -> packetWriter.writeVarInt(2); // Greedy phrase
tabNode.children = new int[0];
tabNode.suggestionsType = "minecraft:ask_server";
if (tracking) {
tabNode.suggestionsType = "minecraft:ask_server";
}
nodes.add(tabNode);
}
DeclareCommandsPacket.Node literalNode = new DeclareCommandsPacket.Node();
literalNode.flags = getFlag(NodeType.LITERAL, true, false, false);
literalNode.name = simpleCommand;
literalNode.name = name;
literalNode.children = new int[]{nodes.size() - 1};
rootChildren.add(nodes.size());

12
src/main/java/net/minestom/server/command/CommandProcessor.java
View File

@ -44,8 +44,20 @@ public interface CommandProcessor {
*/
boolean hasAccess(Player player);
/**
* Disabling it will deactivate the {@link #onWrite(String)} callback
* Enabling it will result in a degression of performance
*
* @return true to enable writing tracking (and server auto completion)
*/
default boolean enableWritingTracking() {
return false;
}
/**
* Allow for tab auto completion, this is called everytime the player press a key in the chat
* <p>
* WARNING: {@link #enableWritingTracking()} needs to return true, you need to override it by default
*
* @param text the whole player text
* @return the array containing all the suggestion for the current arg (split " ")