Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-02-03 14:01:58 +01:00
Code Issues Projects Releases Wiki Activity

Small literal argument cleanup

Browse Source
This commit is contained in:
themode 2021-02-25 15:38:59 +01:00
parent 7da3a16978
commit a0d5ac12bc
2 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/minestom/server/command/builder/arguments/ArgumentEnum.java
View File

@ -6,7 +6,6 @@ import net.minestom.server.network.packet.server.play.DeclareCommandsPacket;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.Locale; import java.util.Locale;
import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ -41,14 +40,6 @@ public class ArgumentEnum<E extends Enum> extends Argument<E> {
@Override @Override
public void processNodes(@NotNull NodeMaker nodeMaker, boolean executable) { public void processNodes(@NotNull NodeMaker nodeMaker, boolean executable) {
// Add the single word properties + parser
final Consumer<DeclareCommandsPacket.Node> wordConsumer = node -> {
node.parser = "brigadier:string";
node.properties = packetWriter -> {
packetWriter.writeVarInt(0); // Single word
};
};
// Create a primitive array for mapping // Create a primitive array for mapping
DeclareCommandsPacket.Node[] nodes = new DeclareCommandsPacket.Node[this.values.length]; DeclareCommandsPacket.Node[] nodes = new DeclareCommandsPacket.Node[this.values.length];
@ -59,7 +50,6 @@ public class ArgumentEnum<E extends Enum> extends Argument<E> {
argumentNode.flags = DeclareCommandsPacket.getFlag(DeclareCommandsPacket.NodeType.LITERAL, argumentNode.flags = DeclareCommandsPacket.getFlag(DeclareCommandsPacket.NodeType.LITERAL,
executable, false, false); executable, false, false);
argumentNode.name = this.format.formatter.apply(this.values[i].name()); argumentNode.name = this.format.formatter.apply(this.values[i].name());
wordConsumer.accept(argumentNode);
nodes[i] = argumentNode; nodes[i] = argumentNode;
} }
nodeMaker.addNodes(nodes); nodeMaker.addNodes(nodes);

24
src/main/java/net/minestom/server/command/builder/arguments/ArgumentWord.java
View File

@ -8,8 +8,6 @@ import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.function.Consumer;
/** /**
* Represents a single word in the command. * Represents a single word in the command.
* <p> * <p>
@ -72,20 +70,10 @@ public class ArgumentWord extends Argument<String> {
@Override @Override
public void processNodes(@NotNull NodeMaker nodeMaker, boolean executable) { public void processNodes(@NotNull NodeMaker nodeMaker, boolean executable) {
if (restrictions != null) {
// Add the single word properties + parser
final Consumer<DeclareCommandsPacket.Node> wordConsumer = node -> {
node.parser = "brigadier:string";
node.properties = packetWriter -> {
packetWriter.writeVarInt(0); // Single word
};
};
final boolean hasRestriction = this.hasRestrictions();
if (hasRestriction) {
// Create a primitive array for mapping // Create a primitive array for mapping
DeclareCommandsPacket.Node[] nodes = new DeclareCommandsPacket.Node[this.getRestrictions().length]; DeclareCommandsPacket.Node[] nodes = new DeclareCommandsPacket.Node[this.restrictions.length];
// Create a node for each restrictions as literal // Create a node for each restrictions as literal
for (int i = 0; i < nodes.length; i++) { for (int i = 0; i < nodes.length; i++) {
@ -93,8 +81,7 @@ public class ArgumentWord extends Argument<String> {
argumentNode.flags = DeclareCommandsPacket.getFlag(DeclareCommandsPacket.NodeType.LITERAL, argumentNode.flags = DeclareCommandsPacket.getFlag(DeclareCommandsPacket.NodeType.LITERAL,
executable, false, false); executable, false, false);
argumentNode.name = this.getRestrictions()[i]; argumentNode.name = this.restrictions[i];
wordConsumer.accept(argumentNode);
nodes[i] = argumentNode; nodes[i] = argumentNode;
} }
@ -102,7 +89,10 @@ public class ArgumentWord extends Argument<String> {
} else { } else {
// Can be any word, add only one argument node // Can be any word, add only one argument node
DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false, false); DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false, false);
wordConsumer.accept(argumentNode); argumentNode.parser = "brigadier:string";
argumentNode.properties = packetWriter -> {
packetWriter.writeVarInt(0); // Single word
};
nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode}); nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
} }
} }