Pass handler to clientside ConfigurationPacketHandler

apple502j · Sep 8, 2023 · 5038f42 · 5038f42
1 parent 3bafade
commit 5038f42
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/...ient/java/net/fabricmc/fabric/api/client/networking/v1/ClientConfigurationNetworking.java b/...ient/java/net/fabricmc/fabric/api/client/networking/v1/ClientConfigurationNetworking.java
@@ -105,10 +105,10 @@ public void receive(MinecraftClient client, ClientConfigurationNetworkHandler ne
 					// Normally, packets are handled on the network IO thread - though it is
 					// not guaranteed (for example, with 1.19.4 S2C packet bundling)
 					// Since we're handling it right now, connection check is redundant.
-					handler.receive(packet, sender);
+					handler.receive(packet, networkHandler, sender);
 				} else {
 					client.execute(() -> {
-						if (((ClientCommonNetworkHandlerAccessor) networkHandler).getConnection().isOpen()) handler.receive(packet, sender);
+						if (((ClientCommonNetworkHandlerAccessor) networkHandler).getConnection().isOpen()) handler.receive(packet, networkHandler, sender);
 					});
 				}
 			}
@@ -218,10 +218,10 @@ public void receive(MinecraftClient client, ClientConfigurationNetworkHandler ne
 					// Normally, packets are handled on the network IO thread - though it is
 					// not guaranteed (for example, with 1.19.4 S2C packet bundling)
 					// Since we're handling it right now, connection check is redundant.
-					handler.receive(packet, sender);
+					handler.receive(packet, networkHandler, sender);
 				} else {
 					client.execute(() -> {
-						if (((ClientCommonNetworkHandlerAccessor) networkHandler).getConnection().isOpen()) handler.receive(packet, sender);
+						if (((ClientCommonNetworkHandlerAccessor) networkHandler).getConnection().isOpen()) handler.receive(packet, networkHandler, sender);
 					});
 				}
 			}
@@ -451,9 +451,10 @@ public interface ConfigurationPacketHandler<T extends FabricPacket> {
 		 *
 		 *
 		 * @param packet the packet
+		 * @param networkHandler the network handler
 		 * @param responseSender the packet sender
 		 * @see FabricPacket
 		 */
-		void receive(T packet, PacketSender responseSender);
+		void receive(T packet, ClientConfigurationNetworkHandler networkHandler, PacketSender responseSender);
 	}
 }
diff --git a/...bricmc/fabric/test/networking/client/configuration/NetworkingConfigurationClientTest.java b/...bricmc/fabric/test/networking/client/configuration/NetworkingConfigurationClientTest.java
@@ -23,7 +23,7 @@
 public class NetworkingConfigurationClientTest implements ClientModInitializer {
 	@Override
 	public void onInitializeClient() {
-		ClientConfigurationNetworking.registerGlobalReceiver(NetworkingConfigurationTest.ConfigurationPacket.PACKET_TYPE, (packet, responseSender) -> {
+		ClientConfigurationNetworking.registerGlobalReceiver(NetworkingConfigurationTest.ConfigurationPacket.PACKET_TYPE, (packet, handler, responseSender) -> {
 			// Handle stuff here
 
 			// Respond back to the server that the task is complete