Don't construct GatherLoginPayloadsEvent when directly dispatching to SimpleChannel

Author: coderbot16

patchwork-networking/src/main/java/com/patchworkmc/impl/networking/ListenableChannel.java

@@ -19,14 +19,16 @@
 
 package com.patchworkmc.impl.networking;
 
+import java.util.List;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
 import net.minecraftforge.fml.network.ICustomPacket;
 import net.minecraftforge.fml.network.NetworkEvent;
+import net.minecraftforge.fml.network.NetworkRegistry;
 
 public interface ListenableChannel {
 	void setPacketListener(BiConsumer<ICustomPacket<?>, NetworkEvent.Context> listener);
 	void setRegistrationChangeListener(Consumer<NetworkEvent.ChannelRegistrationChangeEvent> listener);
-	void setGatherLoginPayloadsListener(Consumer<NetworkEvent.GatherLoginPayloadsEvent> listener);
+	void setGatherLoginPayloadsListener(BiConsumer<List<NetworkRegistry.LoginPayload>, Boolean> listener);
 }

patchwork-networking/src/main/java/com/patchworkmc/impl/networking/NetworkChannel.java

@@ -19,13 +19,15 @@
 
 package com.patchworkmc.impl.networking;
 
+import java.util.List;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
 import net.minecraftforge.fml.network.ICustomPacket;
 import net.minecraftforge.fml.network.NetworkEvent;
+import net.minecraftforge.fml.network.NetworkRegistry;
 
 import net.minecraft.util.Identifier;
 
@@ -34,7 +36,7 @@ public class NetworkChannel implements NamedChannel, ListenableChannel, Versione
 
 	private BiConsumer<ICustomPacket<?>, NetworkEvent.Context> packetListener;
 	private Consumer<NetworkEvent.ChannelRegistrationChangeEvent> registrationChangeListener;
-	private Consumer<NetworkEvent.GatherLoginPayloadsEvent> gatherLoginPayloadsListener;
+	private BiConsumer<List<NetworkRegistry.LoginPayload>, Boolean> gatherLoginPayloadsListener;
 
 	private final String networkProtocolVersion;
 	private final Predicate<String> clientAcceptedVersions;
@@ -63,7 +65,7 @@ public void setRegistrationChangeListener(Consumer<NetworkEvent.ChannelRegistrat
 	}
 
 	@Override
-	public void setGatherLoginPayloadsListener(Consumer<NetworkEvent.GatherLoginPayloadsEvent> listener) {
+	public void setGatherLoginPayloadsListener(BiConsumer<List<NetworkRegistry.LoginPayload>, Boolean> listener) {
 		this.gatherLoginPayloadsListener = listener;
 	}
 
@@ -79,9 +81,9 @@ public void onRegistrationChange(NetworkEvent.ChannelRegistrationChangeEvent eve
 		}
 	}
 
-	public void onGatherLoginPayloads(NetworkEvent.GatherLoginPayloadsEvent event) {
+	public void onGatherLoginPayloads(List<NetworkRegistry.LoginPayload> payloads, boolean isLocal) {
 		if (gatherLoginPayloadsListener != null) {
-			gatherLoginPayloadsListener.accept(event);
+			gatherLoginPayloadsListener.accept(payloads, isLocal);
 		}
 	}
 

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

@@ -158,7 +158,7 @@ static List<LoginPayload> gatherLoginPayloads(final NetworkDirection direction,
 		List<LoginPayload> gatheredPayloads = new ArrayList<>();
 
 		for (NetworkChannel channel: channels.values()) {
-			channel.onGatherLoginPayloads(new NetworkEvent.GatherLoginPayloadsEvent(gatheredPayloads, isLocal));
+			channel.onGatherLoginPayloads(gatheredPayloads, isLocal);
 		}
 
 		return gatheredPayloads;

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

@@ -19,6 +19,7 @@
 
 package net.minecraftforge.fml.network.event;
 
+import java.util.List;
 import java.util.function.Consumer;
 
 import net.minecraftforge.eventbus.api.BusBuilder;
@@ -27,6 +28,7 @@
 import net.minecraftforge.eventbus.api.IEventListener;
 import net.minecraftforge.fml.network.ICustomPacket;
 import net.minecraftforge.fml.network.NetworkEvent;
+import net.minecraftforge.fml.network.NetworkRegistry;
 
 import com.patchworkmc.impl.networking.ListenableChannel;
 
@@ -38,7 +40,7 @@ public EventNetworkChannel(ListenableChannel channel) {
 
 		channel.setPacketListener(this::packetListener);
 		channel.setRegistrationChangeListener(networkEventBus::post);
-		channel.setGatherLoginPayloadsListener(networkEventBus::post);
+		channel.setGatherLoginPayloadsListener(this::gatherLoginPayloadsListener);
 
 		// TODO: Login packet stuff, registration change listeners
 		throw new UnsupportedOperationException("Registration change / gather login payload events aren't supported");
@@ -52,6 +54,10 @@ private void packetListener(final ICustomPacket<?> packet, final NetworkEvent.Co
 		this.networkEventBus.post(packet.getDirection().getEvent(packet, () -> context));
 	}
 
+	private void gatherLoginPayloadsListener(List<NetworkRegistry.LoginPayload> payloads, boolean isLocal) {
+		this.networkEventBus.post(new NetworkEvent.GatherLoginPayloadsEvent(payloads, isLocal));
+	}
+
 	public <T extends NetworkEvent> void addListener(Consumer<T> eventListener) {
 		this.networkEventBus.addListener(eventListener);
 	}

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

@@ -31,6 +31,7 @@
 import net.minecraftforge.fml.network.ICustomPacket;
 import net.minecraftforge.fml.network.NetworkDirection;
 import net.minecraftforge.fml.network.NetworkEvent;
+import net.minecraftforge.fml.network.NetworkRegistry;
 import net.minecraftforge.fml.network.PacketDistributor;
 import org.apache.commons.lang3.tuple.Pair;
 
@@ -60,16 +61,16 @@ private void packetListener(ICustomPacket<?> packet, NetworkEvent.Context contex
 		this.indexedCodec.consume(packet.getInternalData(), packet.getIndex(), context);
 	}
 
-	private void networkLoginGather(final NetworkEvent.GatherLoginPayloadsEvent gatherEvent) {
+	private void networkLoginGather(List<NetworkRegistry.LoginPayload> payloads, boolean isLocal) {
 		for (Function<Boolean, List<Pair<String, ?>>> packetGenerator: loginPackets) {
-			List<Pair<String, ?>> packets = packetGenerator.apply(gatherEvent.isLocal());
+			List<Pair<String, ?>> packets = packetGenerator.apply(isLocal);
 
 			for (Pair<String, ?> pair: packets) {
 				PacketByteBuf buffer = new PacketByteBuf(Unpooled.buffer());
 
 				this.indexedCodec.build(pair.getRight(), buffer);
 
-				gatherEvent.add(buffer, this.channelName, pair.getLeft());
+				payloads.add(new NetworkRegistry.LoginPayload(buffer, this.channelName, pair.getLeft()));
 			}
 		}
 	}