Upstream/ViaFabricPlus
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabricPlus.git synced 2025-01-22 21:42:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bedrock pinging

Browse Source
This commit is contained in:
FlorianMichael 2023-03-22 14:33:20 +01:00
parent 0ded19ee42
commit c620e02b83
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/florianmichael/viafabricplus/injection/access/IClientConnection.java
View File

@ -28,6 +28,8 @@ public interface IClientConnection {
void viafabricplus_setupPreNettyEncryption();
void viafabricplus_captureAddress(final InetSocketAddress socketAddress);
void viafabricplus_enableZLibCompression();
void viafabricplus_enableSnappyCompression();
void viafabricplus_enableAesGcmEncryption(final SecretKey secretKey) throws InvalidAlgorithmParameterException, NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeyException;

13
src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinClientConnection.java
View File

@ -102,6 +102,9 @@ public abstract class MixinClientConnection extends SimpleChannelInboundHandler<
@Unique
private boolean viafabricplus_compressionEnabled = false;
@Unique
private InetSocketAddress viafabricplus_capturedAddress;
@Inject(method = "setCompressionThreshold", at = @At("RETURN"))
private void reorderCompression(int compressionThreshold, boolean rejectBad, CallbackInfo ci) {
channel.pipeline().fireUserEventTriggered(new PipelineReorderEvent());
@ -123,6 +126,7 @@ public abstract class MixinClientConnection extends SimpleChannelInboundHandler<
@Overwrite
public static ClientConnection connect(InetSocketAddress address, boolean useEpoll) {
final ClientConnection clientConnection = new ClientConnection(NetworkSide.CLIENTBOUND);
((IClientConnection) clientConnection).viafabricplus_captureAddress(address);
final Class<? extends AbstractChannel> channelType = Epoll.isAvailable() && useEpoll ? EpollSocketChannel.class : NioSocketChannel.class;
final Lazy<? extends MultithreadEventLoopGroup> lazy = Epoll.isAvailable() && useEpoll ? EPOLL_CLIENT_IO_GROUP : CLIENT_IO_GROUP;
@ -181,7 +185,6 @@ public abstract class MixinClientConnection extends SimpleChannelInboundHandler<
// Pinging in RakNet is something different
if (ProtocolHack.getRakNetPingSessions().contains(address)) {
ProtocolHack.getRakNetPingSessions().remove(address);
{ // Temporary fix for the ping encoder
final RakClientChannel rakChannel = (RakClientChannel) channel;
@ -223,8 +226,9 @@ public abstract class MixinClientConnection extends SimpleChannelInboundHandler<
public void channelRegistered(ChannelHandlerContext ctx) throws Exception {
super.channelRegistered(ctx);
if (ProtocolHack.getTargetVersion(channel).isEqualTo(BedrockProtocolVersion.bedrockLatest)) {
if (ProtocolHack.getRakNetPingSessions().contains(viafabricplus_capturedAddress)) {
channelActive(ctx);
ProtocolHack.getRakNetPingSessions().remove(viafabricplus_capturedAddress);
}
}
@ -240,6 +244,11 @@ public abstract class MixinClientConnection extends SimpleChannelInboundHandler<
this.channel.pipeline().addBefore(PreNettyConstants.HANDLER_ENCODER_NAME, "encrypt", new PacketEncryptor(this.viafabricplus_encryptionCipher));
}
@Override
public void viafabricplus_captureAddress(InetSocketAddress socketAddress) {
viafabricplus_capturedAddress = socketAddress;
}
@Override
public void viafabricplus_enableZLibCompression() {
if (this.viafabricplus_compressionEnabled) throw new IllegalStateException("Compression is already enabled");