Skip to content

Commit

Permalink
Packet fixes - disable neoforge splitter and send minecraft:register (#…
Browse files Browse the repository at this point in the history 
…170)

* Disable NeoForge packet splitting for Fabric packets

* Send minecraft:register for Fabric packets

* Remove unused import
  • Loading branch information
@Moulberry
Moulberry authored Nov 20, 2024
1 parent 220dc0d commit eeccd5b
Show file tree
Hide file tree
Showing 6 changed files with 85 additions and 11 deletions.
13 changes: 13 additions & 0 deletions ...lient/java/net/fabricmc/fabric/mixin/networking/client/ClientPlayNetworkHandlerMixin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,35 @@
import net.minecraft.client.multiplayer.CommonListenerCookie;
import net.minecraft.network.Connection;
import net.minecraft.network.protocol.game.ClientboundLoginPacket;
import net.minecraft.resources.ResourceLocation;
import net.neoforged.neoforge.network.registration.ChannelAttributes;
import org.sinytra.fabric.networking_api.client.NeoClientCommonNetworking;
import org.sinytra.fabric.networking_api.client.NeoClientPlayNetworking;
import org.sinytra.fabric.networking_api.NeoListenableNetworkHandler;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

import java.util.List;
import java.util.Set;

// We want to apply a bit earlier than other mods which may not use us in order to prevent refCount issues
@Mixin(value = ClientPacketListener.class, priority = 999)
abstract class ClientPlayNetworkHandlerMixin extends ClientCommonPacketListenerImpl implements NeoListenableNetworkHandler {
@Shadow
public abstract Connection getConnection();

protected ClientPlayNetworkHandlerMixin(Minecraft client, Connection connection, CommonListenerCookie connectionState) {
super(client, connection, connectionState);
}

@Inject(method = "<init>", at = @At("RETURN"))
private void initAddon(CallbackInfo ci) {
Set<ResourceLocation> channels = ChannelAttributes.getOrCreateCommonChannels(this.getConnection(), this.protocol());
NeoClientCommonNetworking.onRegisterPacket((ClientPacketListener) (Object) this, channels);

NeoClientPlayNetworking.setTempPacketListener((ClientPacketListener) (Object) this);
ClientPlayConnectionEvents.INIT.invoker().onPlayInit((ClientPacketListener) (Object) this, this.minecraft);
}
Expand Down
10 changes: 6 additions & 4 deletions ...1/src/client/java/org/sinytra/fabric/networking_api/client/NeoClientCommonNetworking.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,21 @@
public class NeoClientCommonNetworking {
public static void onRegisterPacket(ICommonPacketListener listener, Set<ResourceLocation> ids) {
ConnectionProtocol protocol = listener.protocol();
List<ResourceLocation> listIds = List.copyOf(ids);
if (protocol == ConnectionProtocol.CONFIGURATION) {
listener.getMainThreadEventLoop().execute(() -> C2SConfigurationChannelEvents.REGISTER.invoker().onChannelRegister((ClientConfigurationPacketListenerImpl) listener, new NeoClientPacketSender(listener.getConnection()), Minecraft.getInstance(), List.copyOf(ids)));
listener.getMainThreadEventLoop().execute(() -> C2SConfigurationChannelEvents.REGISTER.invoker().onChannelRegister((ClientConfigurationPacketListenerImpl) listener, new NeoClientPacketSender(listener.getConnection()), Minecraft.getInstance(), listIds));
} else if (protocol == ConnectionProtocol.PLAY) {
listener.getMainThreadEventLoop().execute(() -> C2SPlayChannelEvents.REGISTER.invoker().onChannelRegister((ClientPacketListener) listener, new NeoClientPacketSender(listener.getConnection()), Minecraft.getInstance(), List.copyOf(ids)));
listener.getMainThreadEventLoop().execute(() -> C2SPlayChannelEvents.REGISTER.invoker().onChannelRegister((ClientPacketListener) listener, new NeoClientPacketSender(listener.getConnection()), Minecraft.getInstance(), listIds));
}
}

public static void onUnregisterPacket(ICommonPacketListener listener, Set<ResourceLocation> ids) {
ConnectionProtocol protocol = listener.protocol();
List<ResourceLocation> listIds = List.copyOf(ids);
if (protocol == ConnectionProtocol.CONFIGURATION) {
listener.getMainThreadEventLoop().execute(() -> C2SConfigurationChannelEvents.UNREGISTER.invoker().onChannelUnregister((ClientConfigurationPacketListenerImpl) listener, new NeoClientPacketSender(listener.getConnection()), Minecraft.getInstance(), List.copyOf(ids)));
listener.getMainThreadEventLoop().execute(() -> C2SConfigurationChannelEvents.UNREGISTER.invoker().onChannelUnregister((ClientConfigurationPacketListenerImpl) listener, new NeoClientPacketSender(listener.getConnection()), Minecraft.getInstance(), listIds));
} else if (protocol == ConnectionProtocol.PLAY) {
listener.getMainThreadEventLoop().execute(() -> C2SPlayChannelEvents.UNREGISTER.invoker().onChannelUnregister((ClientPacketListener) listener, new NeoClientPacketSender(listener.getConnection()), Minecraft.getInstance(), List.copyOf(ids)));
listener.getMainThreadEventLoop().execute(() -> C2SPlayChannelEvents.UNREGISTER.invoker().onChannelUnregister((ClientPacketListener) listener, new NeoClientPacketSender(listener.getConnection()), Minecraft.getInstance(), listIds));
}
}
}
7 changes: 6 additions & 1 deletion ...-v1/src/client/java/org/sinytra/fabric/networking_api/client/NeoClientPlayNetworking.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import net.minecraft.resources.ResourceLocation;
import net.neoforged.neoforge.common.extensions.ICommonPacketListener;
import net.neoforged.neoforge.network.handling.IPayloadContext;
import net.neoforged.neoforge.network.payload.MinecraftRegisterPayload;
import net.neoforged.neoforge.network.registration.NetworkRegistry;
import org.jetbrains.annotations.Nullable;
import org.sinytra.fabric.networking_api.NeoCommonNetworking;
Expand Down Expand Up @@ -70,11 +71,15 @@ public static PacketSender getSender() {
}

public static void onServerReady(ClientPacketListener handler, Minecraft client) {
NeoClientPacketSender packetSender = new NeoClientPacketSender(handler.getConnection());
try {
ClientPlayConnectionEvents.JOIN.invoker().onPlayReady(handler, new NeoClientPacketSender(handler.getConnection()), client);
ClientPlayConnectionEvents.JOIN.invoker().onPlayReady(handler, packetSender, client);
} catch (RuntimeException e) {
LOGGER.error("Exception thrown while invoking ClientPlayConnectionEvents.JOIN", e);
}

MinecraftRegisterPayload registerPacket = new MinecraftRegisterPayload(NeoCommonNetworking.PLAY_REGISTRY.getGlobalReceivers(PacketFlow.CLIENTBOUND));
packetSender.sendPacket(registerPacket);
}

@Nullable
Expand Down
48 changes: 48 additions & 0 deletions ...api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/GenericPacketSplitterMixin.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package net.fabricmc.fabric.mixin.networking;

import io.netty.channel.ChannelHandlerContext;
import net.minecraft.network.HandlerNames;
import net.minecraft.network.PacketEncoder;
import net.minecraft.network.protocol.Packet;
import net.minecraft.network.protocol.PacketFlow;
import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
import net.minecraft.network.protocol.common.ServerboundCustomPayloadPacket;
import net.neoforged.neoforge.network.filters.GenericPacketSplitter;
import net.neoforged.neoforge.network.payload.SplitPacketPayload;
import org.sinytra.fabric.networking_api.NeoNetworkRegistrar;
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 java.util.List;

@Mixin(GenericPacketSplitter.class)
public class GenericPacketSplitterMixin {

/*
* Disable NeoForge packet splitting for Fabric packets
*/

@Inject(method = "encode(Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/network/protocol/Packet;Ljava/util/List;)V", at = @At("HEAD"), cancellable = true)
public void encode(ChannelHandlerContext ctx, Packet<?> packet, List<Object> out, CallbackInfo ci) {
if (packet instanceof ClientboundCustomPayloadPacket clientboundCustomPayloadPacket) {
if (ctx.pipeline().get(HandlerNames.ENCODER) instanceof PacketEncoder<?> encoder) {
var registry = NeoNetworkRegistrar.getPayloadRegistry(encoder.getProtocolInfo().id(), PacketFlow.CLIENTBOUND);
if (registry.get(clientboundCustomPayloadPacket.payload().type()) != null) {
out.add(packet);
ci.cancel();
}
}
} else if (packet instanceof ServerboundCustomPayloadPacket serverboundCustomPayloadPacket) {
if (ctx.pipeline().get(HandlerNames.ENCODER) instanceof PacketEncoder<?> encoder) {
var registry = NeoNetworkRegistrar.getPayloadRegistry(encoder.getProtocolInfo().id(), PacketFlow.SERVERBOUND);
if (registry.get(serverboundCustomPayloadPacket.payload().type()) != null) {
out.add(packet);
ci.cancel();
}
}
}
}

}
7 changes: 6 additions & 1 deletion ...pi-v1/src/main/java/org/sinytra/fabric/networking_api/server/NeoServerPlayNetworking.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.ServerGamePacketListenerImpl;
import net.neoforged.neoforge.network.handling.IPayloadContext;
import net.neoforged.neoforge.network.payload.MinecraftRegisterPayload;
import net.neoforged.neoforge.network.registration.NetworkRegistry;
import org.sinytra.fabric.networking_api.NeoCommonNetworking;

Expand Down Expand Up @@ -57,7 +58,11 @@ public static PacketSender getSender(ServerGamePacketListenerImpl handler) {
}

public static void onClientReady(ServerPlayer player) {
ServerPlayConnectionEvents.JOIN.invoker().onPlayReady(player.connection, new NeoServerPacketSender(player.connection.getConnection()), player.server);
NeoServerPacketSender packetSender = new NeoServerPacketSender(player.connection.getConnection());
ServerPlayConnectionEvents.JOIN.invoker().onPlayReady(player.connection,packetSender, player.server);

MinecraftRegisterPayload registerPacket = new MinecraftRegisterPayload(NeoCommonNetworking.PLAY_REGISTRY.getGlobalReceivers(PacketFlow.SERVERBOUND));
packetSender.sendPacket(registerPacket);
}

private record ServerNeoContextWrapper(IPayloadContext context) implements ServerPlayNetworking.Context {
Expand Down
11 changes: 6 additions & 5 deletions fabric-networking-api-v1/src/main/resources/fabric-networking-api-v1.mixins.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,19 @@
"mixins": [
"ClientConnectionMixin",
"EntityTrackerEntryMixin",
"GenericPacketSplitterMixin",
"LoginQueryRequestS2CPacketMixin",
"LoginQueryResponseC2SPacketMixin",
"NetworkRegistryMixin",
"ServerCommonNetworkHandlerMixin",
"ServerConfigurationNetworkHandlerMixin",
"ServerLoginNetworkHandlerMixin",
"ServerPlayNetworkHandlerMixin",
"NetworkRegistryMixin",
"ServerCommonNetworkHandlerMixin",
"accessor.EntityTrackerAccessor",
"accessor.ServerCommonNetworkHandlerAccessor",
"accessor.ServerLoginNetworkHandlerAccessor",
"accessor.NetworkRegistryAccessor",
"accessor.ServerChunkLoadingManagerAccessor",
"accessor.NetworkRegistryAccessor"
"accessor.ServerCommonNetworkHandlerAccessor",
"accessor.ServerLoginNetworkHandlerAccessor"
],
"injectors": {
"defaultRequire": 1
Expand Down

0 comments on commit eeccd5b

Please sign in to comment.