From 5f3c31bc481cb2ced43b9f1866b9bc7619a123b5 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Sat, 29 Dec 2018 11:07:45 -0500 Subject: [PATCH] Fix Checkstyle issues. --- .../proxy/protocol/packet/AvailableCommands.java | 14 +++++++------- .../packet/brigadier/ArgumentPropertyRegistry.java | 10 ++++++++++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/AvailableCommands.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/AvailableCommands.java index 086c4455f..671d1b128 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/AvailableCommands.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/AvailableCommands.java @@ -25,13 +25,10 @@ import com.velocitypowered.proxy.protocol.packet.brigadier.ArgumentPropertyRegis import io.netty.buffer.ByteBuf; import it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2IntMap; -import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import java.util.ArrayDeque; -import java.util.ArrayList; import java.util.Arrays; import java.util.Deque; import java.util.Iterator; -import java.util.List; import java.util.Queue; import java.util.concurrent.CompletableFuture; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; @@ -51,6 +48,10 @@ public class AvailableCommands implements MinecraftPacket { @MonotonicNonNull private RootCommandNode rootNode; + /** + * Returns the root node. + * @return the root node + */ public RootCommandNode getRootNode() { if (rootNode == null) { throw new IllegalStateException("Packet not yet deserialized"); @@ -63,8 +64,7 @@ public class AvailableCommands implements MinecraftPacket { int commands = ProtocolUtils.readVarInt(buf); WireNode[] wireNodes = new WireNode[commands]; for (int i = 0; i < commands; i++) { - WireNode node = deserializeNode(buf, i); - wireNodes[i] = node; + wireNodes[i] = deserializeNode(buf, i); } // Iterate over the deserialized nodes and attempt to form a graph. We also resolve any cycles @@ -104,7 +104,7 @@ public class AvailableCommands implements MinecraftPacket { } } - // Now serialize the children + // Now serialize the children. ProtocolUtils.writeVarInt(buf, idMappings.size()); for (CommandNode child : idMappings.keySet()) { serializeNode(child, buf, idMappings); @@ -220,7 +220,7 @@ public class AvailableCommands implements MinecraftPacket { this.args = args; } - public boolean toNode(WireNode[] wireNodes) { + boolean toNode(WireNode[] wireNodes) { if (this.built == null) { // Ensure all children exist. Note that we delay checking if the node has been built yet; // that needs to come after this node is built. diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/brigadier/ArgumentPropertyRegistry.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/brigadier/ArgumentPropertyRegistry.java index 1b68b13bb..31fad6e61 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/brigadier/ArgumentPropertyRegistry.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/brigadier/ArgumentPropertyRegistry.java @@ -38,6 +38,11 @@ public class ArgumentPropertyRegistry { byId.put(identifier, serializer); } + /** + * Deserializes the {@link ArgumentType}. + * @param buf the buffer to deserialize + * @return the deserialized {@link ArgumentType} + */ public static ArgumentType deserialize(ByteBuf buf) { String identifier = ProtocolUtils.readString(buf); ArgumentPropertySerializer serializer = byId.get(identifier); @@ -53,6 +58,11 @@ public class ArgumentPropertyRegistry { } } + /** + * Serializes the {@code type} into the provided {@code buf}. + * @param buf the buffer to serialize into + * @param type the type to serialize + */ public static void serialize(ByteBuf buf, ArgumentType type) { if (type instanceof DummyProperty) { DummyProperty property = (DummyProperty) type;