Preserve the pipeline order when async sending/receiving packets

Author: Tim203

src/main/java/com/comphenix/protocol/injector/netty/channel/NettyChannelInjector.java

@@ -271,7 +271,7 @@ public void sendClientboundPacket(Object packet, NetworkMarker marker, boolean f
         }
 
         try {
-            this.listenerInvoker.send(packet);
+            this.channel.pipeline().context(WIRE_PACKET_ENCODER_NAME).writeAndFlush(packet);
         } catch (Exception exception) {
             this.errorReporter.reportWarning(this, Report.newBuilder(REPORT_CANNOT_SEND_PACKET)
                     .messageParam(packet, this.playerName)
@@ -289,8 +289,7 @@ public void readServerboundPacket(Object packet) {
 
         this.ensureInEventLoop(() -> {
             try {
-                // try to invoke the method, this should normally not fail
-                this.listenerInvoker.read(packet);
+                this.channel.pipeline().context(INBOUND_INTERCEPTOR_NAME).fireChannelRead(packet);
             } catch (Exception exception) {
                 this.errorReporter.reportWarning(this, Report.newBuilder(REPORT_CANNOT_READ_PACKET)
                         .messageParam(packet, this.playerName)

src/main/java/com/comphenix/protocol/injector/netty/channel/PacketListenerInvoker.java

@@ -14,13 +14,11 @@
 import com.comphenix.protocol.utility.MinecraftReflection;
 import com.comphenix.protocol.wrappers.WrappedChatComponent;
 
-import io.netty.channel.ChannelHandlerContext;
-
 /**
  * This class facilitates the invocation of methods on the current packet listener.
- * It attempts to execute the <code>send</code>, <code>read</code>, and <code>disconnect</code> 
- * methods and, upon failure (either due to the absence of the method or the packet 
- * listener being of an incorrect type), it delegates the call to the network manager.
+ * It attempts to execute the <code>disconnect</code> method, upon failure
+ * (either due to the absence of the method or the packet listener being of an incorrect type),
+ * it delegates the call to the network manager.
  * 
  * <p>Supported packet listener types include CONFIGURATION and PLAY. If the packet
  * listener does not match these types, or if the required method is missing, the 
@@ -38,36 +36,15 @@ public class PacketListenerInvoker {
     private static final Class<?> COMMON_PACKET_LISTENER_CLASS = MinecraftReflection.getNullableNMS("server.network.ServerCommonPacketListenerImpl");
     private static final Class<?> PREFERRED_PACKET_LISTENER_CLASS = COMMON_PACKET_LISTENER_CLASS != null ? COMMON_PACKET_LISTENER_CLASS : GAME_PACKET_LISTENER_CLASS;
 
-    private static final MethodAccessor PACKET_LISTENER_SEND = getPacketListenerSend();
     private static final MethodAccessor PACKET_LISTENER_DISCONNECT = getPacketListenerDisconnect();
     private static final boolean DOES_PACKET_LISTENER_DISCONNECT_USE_COMPONENT = doesPacketListenerDisconnectUseComponent();
 
-    private static final MethodAccessor NETWORK_MANAGER_SEND = getNetworkManagerSend();
-    private static final MethodAccessor NETWORK_MANAGER_READ = getNetworkManagerRead();
     private static final MethodAccessor NETWORK_MANAGER_DISCONNECT = getNetworkManagerDisconnect();
     private static final MethodAccessor NETWORK_MANAGER_PACKET_LISTENER = getNetworkManagerPacketListener();
 
     public static void ensureStaticInitializedWithoutError() {
     }
 
-    private static MethodAccessor getPacketListenerSend() {
-        FuzzyReflection packetListener = FuzzyReflection.fromClass(PREFERRED_PACKET_LISTENER_CLASS);
-
-        List<Method> send = packetListener.getMethodList(FuzzyMethodContract.newBuilder()
-                .banModifier(Modifier.STATIC)
-                .returnTypeVoid()
-                .parameterCount(1)
-                .parameterExactType(MinecraftReflection.getPacketClass(), 0)
-                .build());
-
-        if (send.isEmpty()) {
-            ProtocolLogger.debug("Can't get packet listener send method");
-            return null;
-        }
-
-        return Accessors.getMethodAccessor(send.get(0));
-    }
-
     private static MethodAccessor getPacketListenerDisconnect() {
         FuzzyReflection packetListener = FuzzyReflection.fromClass(PREFERRED_PACKET_LISTENER_CLASS);
 
@@ -104,28 +81,6 @@ private static boolean doesPacketListenerDisconnectUseComponent() {
         return false;
     }
 
-    private static MethodAccessor getNetworkManagerSend() {
-        FuzzyReflection networkManager = FuzzyReflection.fromClass(MinecraftReflection.getNetworkManagerClass());
-
-        Method send = networkManager.getMethod(FuzzyMethodContract.newBuilder()
-                .banModifier(Modifier.STATIC)
-                .returnTypeVoid()
-                .parameterCount(1)
-                .parameterExactType(MinecraftReflection.getPacketClass(), 0)
-                .build());
-
-        return Accessors.getMethodAccessor(send);
-    }
-
-    private static MethodAccessor getNetworkManagerRead() {
-        FuzzyReflection networkManager = FuzzyReflection.fromClass(MinecraftReflection.getNetworkManagerClass(), true);
-
-        Method read = networkManager
-            .getMethodByParameters("read", ChannelHandlerContext.class, MinecraftReflection.getPacketClass());
-
-        return Accessors.getMethodAccessor(read);
-    }
-
     private static MethodAccessor getNetworkManagerDisconnect() {
         FuzzyReflection networkManager = FuzzyReflection.fromClass(MinecraftReflection.getNetworkManagerClass());
 
@@ -189,30 +144,6 @@ private Object getPacketListener() {
         return this.packetListener.get();
     }
 
-    /**
-     * Sends a packet using the current packet listener if available and valid; otherwise, 
-     * falls back to the network manager.
-     *
-     * @param packet The packet to be sent.
-     */
-    public void send(Object packet) {
-        Object packetListener = this.getPacketListener();
-        if (PACKET_LISTENER_SEND != null && packetListener != null) {
-            PACKET_LISTENER_SEND.invoke(packetListener, packet);
-        } else {
-            NETWORK_MANAGER_SEND.invoke(this.networkManager, packet);
-        }
-    }
-
-    /**
-     * Reads a packet directly using the network manager.
-     *
-     * @param packet The packet to be read.
-     */
-    public void read(Object packet) {
-        NETWORK_MANAGER_READ.invoke(this.networkManager, null, packet);
-    }
-
     /**
      * Disconnects the player using the current packet listener if available and valid; otherwise, 
      * falls back to the network manager.