Avoid List creation and collection reversal in transforming

common/src/main/java/us/myles/ViaVersion/api/PacketWrapper.java

@@ -16,13 +16,13 @@ import us.myles.ViaVersion.util.PipelineUtil;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.NoSuchElementException;
 
 public class PacketWrapper {
     public static final int PASSTHROUGH_ID = 1000;
+    private static final Protocol[] PROTOCOL_ARRAY = new Protocol[0];
 
     private final ByteBuf inputBuffer;
     private final UserConnection userConnection;
@@ -317,30 +317,33 @@ public class PacketWrapper {
      * @throws Exception if it fails to write
      */
     private ByteBuf constructPacket(Class<? extends Protocol> packetProtocol, boolean skipCurrentPipeline, Direction direction) throws Exception {
-        // Apply current pipeline
+        // Apply current pipeline - for outgoing protocol, the collection will be reversed in the apply method
-        List<Protocol> protocols = new ArrayList<>(user().getProtocolInfo().getPipeline().pipes());
+        Protocol[] protocols = user().getProtocolInfo().getPipeline().pipes().toArray(PROTOCOL_ARRAY);
-        if (direction == Direction.OUTGOING) {
+        boolean reverse = direction == Direction.OUTGOING;
-            // Other way if outgoing
-            Collections.reverse(protocols);
-        }
         int index = -1;
-        for (int i = 0; i < protocols.size(); i++) {
+        for (int i = 0; i < protocols.length; i++) {
-            if (protocols.get(i).getClass().equals(packetProtocol)) {
+            if (protocols[i].getClass() == packetProtocol) {
-                index = skipCurrentPipeline ? (i + 1) : (i);
+                index = i;
                 break;
             }
         }
-        if (index == -1) throw new NoSuchElementException(packetProtocol.getCanonicalName());
+
+        if (index == -1) {
+            // The given protocol is not in the pipeline
+            throw new NoSuchElementException(packetProtocol.getCanonicalName());
+        }
+
+        if (skipCurrentPipeline) {
+            index = reverse ? index - 1 : index + 1;
+        }
 
         // Reset reader before we start
         resetReader();
 
         // Apply other protocols
-        apply(direction, user().getProtocolInfo().getState(), index, protocols);
+        apply(direction, user().getProtocolInfo().getState(), index, protocols, reverse);
-        // Send
         ByteBuf output = inputBuffer == null ? user().getChannel().alloc().buffer() : inputBuffer.alloc().buffer();
         writeToBuffer(output);
-
         return output;
     }
 
@@ -417,22 +420,41 @@ public class PacketWrapper {
     }
 
     /**
-     * Applies a pipeline from an index to the wrapper
+     * Applies a pipeline from an index to the wrapper.
      *
-     * @param direction The direction
+     * @param direction protocol direction
-     * @param state     The state
+     * @param state     protocol state
-     * @param index     The index to start from
+     * @param index     index to start from, will be reversed depending on the reverse parameter
-     * @param pipeline  The pipeline
+     * @param pipeline  protocol pipeline
+     * @param reverse   whether the array should be looped in reverse, will also reverse the given index
      * @return The current packetwrapper
      * @throws Exception If it fails to transform a packet, exception will be thrown
      */
-    public PacketWrapper apply(Direction direction, State state, int index, List<Protocol> pipeline) throws Exception {
+    public PacketWrapper apply(Direction direction, State state, int index, List<Protocol> pipeline, boolean reverse) throws Exception {
-        for (int i = index; i < pipeline.size(); i++) { // Copy to prevent from removal.
+        Protocol[] array = pipeline.toArray(PROTOCOL_ARRAY);
-            pipeline.get(i).transform(direction, state, this);
+        return apply(direction, state, reverse ? array.length - 1 : index, array, reverse); // Copy to prevent from removal
-            // Reset the reader for the packetWrapper (So it can be recycled across packets)
+    }
-            resetReader();
-        }
 
+    /**
+     * @see #apply(Direction, State, int, List, boolean)
+     */
+    public PacketWrapper apply(Direction direction, State state, int index, List<Protocol> pipeline) throws Exception {
+        return apply(direction, state, index, pipeline.toArray(PROTOCOL_ARRAY), false);
+    }
+
+    private PacketWrapper apply(Direction direction, State state, int index, Protocol[] pipeline, boolean reverse) throws Exception {
+        // Reset the reader after every transformation for the packetWrapper, so it can be recycled across packets
+        if (reverse) {
+            for (int i = index; i >= 0; i--) {
+                pipeline[i].transform(direction, state, this);
+                resetReader();
+            }
+        } else {
+            for (int i = index; i < pipeline.length; i++) {
+                pipeline[i].transform(direction, state, this);
+                resetReader();
+            }
+        }
         return this;
     }
 

common/src/main/java/us/myles/ViaVersion/api/protocol/Protocol.java

@@ -459,6 +459,14 @@ public abstract class Protocol<C1 extends ClientboundPacketType, C2 extends Clie
         storedObjects.put(object.getClass(), object);
     }
 
+    /**
+     * Returns true if this Protocol's {@link #loadMappingData()} method should be called.
+     * <p>
+     * This does *not* necessarily mean that {@link #getMappingData()} is non-null, since this may be
+     * overriden, depending on special cases.
+     *
+     * @return true if this Protocol's {@link #loadMappingData()} method should be called
+     */
     public boolean hasMappingDataToLoad() {
         return getMappingData() != null;
     }

common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolPipeline.java

@@ -9,7 +9,6 @@ import us.myles.ViaVersion.packets.State;
 import us.myles.ViaVersion.protocols.base.ProtocolInfo;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.logging.Level;
@@ -19,7 +18,6 @@ public class ProtocolPipeline extends SimpleProtocol {
     private UserConnection userConnection;
 
     public ProtocolPipeline(UserConnection userConnection) {
-        super();
         init(userConnection);
     }
 
@@ -72,39 +70,38 @@ public class ProtocolPipeline extends SimpleProtocol {
     @Override
     public void transform(Direction direction, State state, PacketWrapper packetWrapper) throws Exception {
         int originalID = packetWrapper.getId();
-        List<Protocol> protocols = new ArrayList<>(protocolList);
-        // Other way if outgoing
-        if (direction == Direction.OUTGOING)
-            Collections.reverse(protocols);
 
         // Apply protocols
-        packetWrapper.apply(direction, state, 0, protocols);
+        packetWrapper.apply(direction, state, 0, protocolList, direction == Direction.OUTGOING);
         super.transform(direction, state, packetWrapper);
 
         if (Via.getManager().isDebug()) {
-            // Debug packet
+            logPacket(direction, state, packetWrapper, originalID);
-            int serverProtocol = userConnection.getProtocolInfo().getServerProtocolVersion();
-            int clientProtocol = userConnection.getProtocolInfo().getProtocolVersion();
-            ViaPlatform platform = Via.getPlatform();
-
-            String actualUsername = packetWrapper.user().getProtocolInfo().getUsername();
-            String username = actualUsername != null ? actualUsername + " " : "";
-
-            platform.getLogger().log(Level.INFO, "{0}{1} {2}: {3} (0x{4}) -> {5} (0x{6}) [{7}] {8}",
-                    new Object[]{
-                            username,
-                            direction,
-                            state,
-                            originalID,
-                            Integer.toHexString(originalID),
-                            packetWrapper.getId(),
-                            Integer.toHexString(packetWrapper.getId()),
-                            Integer.toString(clientProtocol),
-                            packetWrapper
-                    });
         }
     }
 
+    private void logPacket(Direction direction, State state, PacketWrapper packetWrapper, int originalID) {
+        // Debug packet
+        int clientProtocol = userConnection.getProtocolInfo().getProtocolVersion();
+        ViaPlatform platform = Via.getPlatform();
+
+        String actualUsername = packetWrapper.user().getProtocolInfo().getUsername();
+        String username = actualUsername != null ? actualUsername + " " : "";
+
+        platform.getLogger().log(Level.INFO, "{0}{1} {2}: {3} (0x{4}) -> {5} (0x{6}) [{7}] {8}",
+                new Object[]{
+                        username,
+                        direction,
+                        state,
+                        originalID,
+                        Integer.toHexString(originalID),
+                        packetWrapper.getId(),
+                        Integer.toHexString(packetWrapper.getId()),
+                        Integer.toString(clientProtocol),
+                        packetWrapper
+                });
+    }
+
     /**
      * Check if the pipeline contains a protocol
      *

common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java

@@ -372,6 +372,7 @@ public class ProtocolRegistry {
     }
 
     private static void shutdownLoaderExecutor() {
+        Via.getPlatform().getLogger().info("Shutting down mapping loader executor!");
         mappingsLoaded = true;
         mappingLoaderExecutor.shutdown();
         mappingLoaderExecutor = null;