Avoid unnecessary indirection through a BiConsumer in PacketDispatcher

Author: coderbot16

patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkEvent.java

@@ -216,7 +216,7 @@ public static class Context {
 		private boolean packetHandled;
 
 		Context(ClientConnection connection, NetworkDirection networkDirection, int index) {
-			this(connection, networkDirection, new PacketDispatcher.ClientConnectionDispatcher(connection, index, networkDirection.reply()::buildPacket));
+			this(connection, networkDirection, new PacketDispatcher.ClientConnectionDispatcher(connection, index, networkDirection.reply()));
 		}
 
 		Context(ClientConnection clientConnection, NetworkDirection networkDirection, PacketDispatcher dispatcher) {

patchwork-networking/src/main/java/net/minecraftforge/fml/network/PacketDispatcher.java

@@ -20,7 +20,6 @@
 package net.minecraftforge.fml.network;
 
 import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
 
 import org.apache.commons.lang3.tuple.Pair;
 
@@ -32,35 +31,42 @@
  * Dispatcher for sending packets in response to a received packet. Abstracts out the difference between wrapped packets
  * and unwrapped packets.
  */
-public class PacketDispatcher {
-	BiConsumer<Identifier, PacketByteBuf> packetSink;
-
-	PacketDispatcher(final BiConsumer<Identifier, PacketByteBuf> packetSink) {
-		this.packetSink = packetSink;
-	}
-
+public abstract class PacketDispatcher {
 	private PacketDispatcher() {
-		// NO-OP; cannot call package-private constructor due to Java limitations
+		// No-op
 	}
 
-	public void sendPacket(Identifier identifier, PacketByteBuf buffer) {
-		packetSink.accept(identifier, buffer);
+	public abstract void sendPacket(Identifier identifier, PacketByteBuf buffer);
+
+	static class FunctionalDispatcher extends PacketDispatcher {
+		private final BiConsumer<Identifier, PacketByteBuf> packetSink;
+
+		FunctionalDispatcher(final BiConsumer<Identifier, PacketByteBuf> packetSink) {
+			this.packetSink = packetSink;
+		}
+
+		@Override
+		public void sendPacket(final Identifier identifier, final PacketByteBuf buffer) {
+			packetSink.accept(identifier, buffer);
+		}
 	}
 
 	static class ClientConnectionDispatcher extends PacketDispatcher {
 		private final ClientConnection connection;
 		private final int packetIndex;
-		private final BiFunction<Pair<PacketByteBuf, Integer>, Identifier, ICustomPacket<?>> customPacketSupplier;
+		private final NetworkDirection direction;
 
-		ClientConnectionDispatcher(ClientConnection connection, int packetIndex, BiFunction<Pair<PacketByteBuf, Integer>, Identifier, ICustomPacket<?>> customPacketSupplier) {
+		ClientConnectionDispatcher(ClientConnection connection, int packetIndex, NetworkDirection direction) {
 			super();
 			this.connection = connection;
 			this.packetIndex = packetIndex;
-			this.customPacketSupplier = customPacketSupplier;
+			this.direction = direction;
 		}
 
-		private void dispatchPacket(final Identifier connection, final PacketByteBuf buffer) {
-			final ICustomPacket<?> packet = this.customPacketSupplier.apply(Pair.of(buffer, packetIndex), connection);
+		@Override
+		public void sendPacket(final Identifier identifier, final PacketByteBuf buffer) {
+			final ICustomPacket<?> packet = this.direction.buildPacket(Pair.of(buffer, packetIndex), identifier);
+
 			this.connection.send(packet.getThis());
 		}
 	}