Networking part 3

Author: Su5eD

fabric-events-interaction-v0/build.gradle

@@ -1,6 +1,6 @@
 version = getSubprojectVersion(project)
 
-moduleDependencies(project, ['fabric-api-base'])
+moduleDependencies(project, ['fabric-api-base', 'fabric-networking-api-v1'])
 
 testDependencies(project, [
     'fabric-client-gametest-api-v1'

fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/impl/event/interaction/FakePlayerPacketListener.java

@@ -17,6 +17,9 @@
 package net.fabricmc.fabric.impl.event.interaction;
 
 import io.netty.channel.ChannelFutureListener;
+
+import net.fabricmc.fabric.impl.networking.UntrackedPacketListener;
+
 import org.jspecify.annotations.Nullable;
 
 import net.minecraft.network.Connection;
@@ -26,7 +29,7 @@
 import net.minecraft.server.network.CommonListenerCookie;
 import net.minecraft.server.network.ServerGamePacketListenerImpl;
 
-public final class FakePlayerPacketListener extends ServerGamePacketListenerImpl {
+public final class FakePlayerPacketListener extends ServerGamePacketListenerImpl implements UntrackedPacketListener {
 	private static final Connection FAKE_CONNECTION = new FakeConnection();
 
 	public FakePlayerPacketListener(ServerPlayer player) {

fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/mixin/networking/client/ClientNetworkRegistryMixin.java

@@ -9,10 +9,14 @@
 import net.minecraft.network.protocol.common.ClientCommonPacketListener;
 import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
 
+import net.fabricmc.fabric.impl.networking.NetworkingImpl;
+
 @Mixin(ClientNetworkRegistry.class)
 public class ClientNetworkRegistryMixin {
-	@Inject(method = "handleModdedPayload", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/Connection;disconnect(Lnet/minecraft/network/chat/Component;)V"), cancellable = true)
+	@Inject(method = "handleModdedPayload", at = @At(value = "INVOKE", target = "Ljava/util/Map;containsKey(Ljava/lang/Object;)Z"), cancellable = true)
 	private static void preventDisconnect(ClientCommonPacketListener listener, ClientboundCustomPayloadPacket packet, CallbackInfo ci) {
-		ci.cancel();
+		if (NetworkingImpl.getCodec(packet.payload().type().id(), listener.protocol(), listener.flow()) != null) {
+			ci.cancel();
+		}
 	}
 }

fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/mixin/networking/client/NetworkRegistryClientMixin.java

@@ -0,0 +1,45 @@
+package net.fabricmc.fabric.mixin.networking.client;
+
+import net.neoforged.neoforge.network.registration.NetworkRegistry;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import net.minecraft.network.ConnectionProtocol;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.common.ClientCommonPacketListener;
+import net.minecraft.network.protocol.common.ServerboundCustomPayloadPacket;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload.Type;
+
+import net.fabricmc.fabric.api.client.networking.v1.ClientConfigurationNetworking;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
+import net.fabricmc.fabric.impl.networking.NetworkingImpl;
+
+@Mixin(NetworkRegistry.class)
+public class NetworkRegistryClientMixin {
+	@Inject(
+			method = "checkPacket(Lnet/minecraft/network/protocol/Packet;Lnet/minecraft/network/protocol/common/ClientCommonPacketListener;)V",
+			at = @At(
+					value = "INVOKE",
+					target = "Lnet/neoforged/neoforge/network/registration/NetworkRegistry;hasChannel(Lnet/neoforged/neoforge/common/extensions/ICommonPacketListener;Lnet/minecraft/resources/Identifier;)Z"
+			),
+			cancellable = true
+	)
+	private static void checkFabricClientPacket(Packet<?> packet, ClientCommonPacketListener listener, CallbackInfo ci) {
+		ServerboundCustomPayloadPacket customPayloadPacket = (ServerboundCustomPayloadPacket) packet;
+		Type<?> type = customPayloadPacket.payload().type();
+		
+		if (listener.protocol() == ConnectionProtocol.CONFIGURATION && ClientConfigurationNetworking.canSend(type)) {
+			ci.cancel();
+		}
+		
+		if (listener.protocol() == ConnectionProtocol.PLAY && ClientPlayNetworking.canSend(type)) {
+			ci.cancel();
+		}
+		
+		if (NetworkingImpl.getCodec(type.id(), listener.protocol(), listener.flow()) != null) {
+			ci.cancel();
+		}
+	}
+}

fabric-networking-api-v1/src/client/resources/fabric-networking-api-v1.client.mixins.json

@@ -12,7 +12,8 @@
     "ClientHandshakePacketListenerImplMixin",
     "ClientPacketListenerMixin",
     "LocalPlayerMixin",
-    "ClientNetworkRegistryMixin"
+    "ClientNetworkRegistryMixin",
+    "NetworkRegistryClientMixin"
   ],
   "injectors": {
     "defaultRequire": 1

fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/AbstractChanneledNetworkAddon.java

@@ -81,18 +81,23 @@ public boolean handle(CustomPacketPayload payload) {
 		if (payload instanceof MinecraftRegisterPayload registrationPayload) {
 			this.receiveRegistration(true, new RegistrationPayload(RegistrationPayload.REGISTER,
 					new ArrayList<>(registrationPayload.newChannels())));
-			return true;
+			return false; // Propagate to Neo
 		}
 
 		if (payload instanceof MinecraftUnregisterPayload unregisterPayload) {
 			this.receiveRegistration(false, new RegistrationPayload(RegistrationPayload.UNREGISTER,
 					new ArrayList<>(unregisterPayload.forgottenChannels())));
-			return true;
+			return false; // Propagate to Neo
 		}
 
 		@Nullable H handler = this.getHandler(channelName);
 
 		if (handler == null) {
+			// FFAPI: Prevent Neo from panicking
+			if (this.receiver.getPayloadTypeRegistry().get(channelName) != null) {
+				return true;
+			}
+			
 			return false;
 		}
 
@@ -156,13 +161,19 @@ private void registerChannel(Identifier id) {
 		}
 
 		this.sendableChannels.add(id);
+		onUpdateSendableChannels();
 	}
 
 	void unregister(List<Identifier> ids) {
 		this.sendableChannels.removeAll(ids);
+		onUpdateSendableChannels();
 		schedule(() -> this.invokeUnregisterEvent(ids));
 	}
 
+	protected void onUpdateSendableChannels() {
+		
+	}
+
 	@Override
 	public void sendPacket(Packet<?> packet, ChannelFutureListener callback) {
 		Objects.requireNonNull(packet, "Packet cannot be null");

fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/CustomPayloadTypeProvider.java

@@ -231,4 +231,8 @@ public void assertPayloadType(Identifier channelName) {
 	public ConnectionProtocol getProtocol() {
 		return protocol;
 	}
+
+	public @Nullable PayloadTypeRegistryImpl<?> getPayloadTypeRegistry() {
+		return payloadTypeRegistry;
+	}
 }