Upstream/ViaFabric
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabric.git synced 2024-09-28 04:07:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix #89

Browse Source
This commit is contained in:
creeper123123321 2021-01-03 16:36:53 -03:00
parent 6dce8a7b1f
commit c94b4a867f
3 changed files with 43 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/github/creeper123123321/viafabric/handler/FabricDecodeHandler.java
View File

@ -26,6 +26,7 @@
package com.github.creeper123123321.viafabric.handler;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToMessageDecoder;
import us.myles.ViaVersion.api.data.UserConnection;
@ -35,6 +36,7 @@ import us.myles.ViaVersion.util.PipelineUtil;
import java.util.List;
@ChannelHandler.Sharable
public class FabricDecodeHandler extends MessageToMessageDecoder<ByteBuf> {
private final UserConnection info;

2
src/main/java/com/github/creeper123123321/viafabric/handler/FabricEncodeHandler.java
View File

@ -26,6 +26,7 @@
package com.github.creeper123123321.viafabric.handler;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToMessageEncoder;
import us.myles.ViaVersion.api.data.UserConnection;
@ -35,6 +36,7 @@ import us.myles.ViaVersion.util.PipelineUtil;
import java.util.List;
@ChannelHandler.Sharable
public class FabricEncodeHandler extends MessageToMessageEncoder<ByteBuf> {
private final UserConnection info;

74
src/main/java/com/github/creeper123123321/viafabric/mixin/pipeline/MixinClientConnection.java
View File

@ -26,50 +26,54 @@
package com.github.creeper123123321.viafabric.mixin.pipeline;
import com.github.creeper123123321.viafabric.handler.CommonTransformer;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelPipeline;
import com.github.creeper123123321.viafabric.handler.FabricDecodeHandler;
import com.github.creeper123123321.viafabric.handler.FabricEncodeHandler;
import io.netty.channel.Channel;
import net.minecraft.network.ClientConnection;
import org.apache.logging.log4j.Logger;
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.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(ClientConnection.class)
public class MixinClientConnection {
//@Redirect(
// method = "exceptionCaught",
// remap = false,
// at = @At(
// value = "INVOKE",
// target = "Lorg/apache/logging/log4j/Logger;debug(Ljava/lang/String;Ljava/lang/Throwable;)V"
// ))
//private void redirectDebug(Logger logger, String message, Throwable t) {
// if ("Failed to sent packet".equals(message)) {
// logger.info(message, t);
// } else {
// logger.debug(message, t);
// }
//}
@Shadow
private Channel channel;
@Redirect(method = "setCompressionThreshold(I)V", at = @At(
value = "INVOKE",
target = "Lio/netty/channel/ChannelPipeline;addBefore(Ljava/lang/String;Ljava/lang/String;Lio/netty/channel/ChannelHandler;)Lio/netty/channel/ChannelPipeline;"
))
private ChannelPipeline decodeEncodePlacement(ChannelPipeline instance, String base, String newHandler, ChannelHandler handler) {
// Fixes the handler order
switch (base) {
case "decoder": {
if (instance.get(CommonTransformer.HANDLER_DECODER_NAME) != null)
base = CommonTransformer.HANDLER_DECODER_NAME;
break;
}
case "encoder": {
if (instance.get(CommonTransformer.HANDLER_ENCODER_NAME) != null)
base = CommonTransformer.HANDLER_ENCODER_NAME;
break;
}
/*
@Redirect(
method = "exceptionCaught",
remap = false,
at = @At(
value = "INVOKE",
target = "Lorg/apache/logging/log4j/Logger;debug(Ljava/lang/String;Ljava/lang/Throwable;)V"
))
private void redirectDebug(Logger logger, String message, Throwable t) {
if ("Failed to sent packet".equals(message)) {
logger.info(message, t);
} else {
logger.debug(message, t);
}
return instance.addBefore(base, newHandler, handler);
}
*/
@Inject(method = "setCompressionThreshold", at = @At(
value = "RETURN",
remap = false
))
private void fixCompressionOrder(int compressionThreshold, CallbackInfo ci) {
if (channel.pipeline().get(FabricEncodeHandler.class) == null) return;
if (channel.pipeline().names().indexOf("compress")
< channel.pipeline().names().indexOf(CommonTransformer.HANDLER_ENCODER_NAME)) {
return; // Order is correct or compression is disabled
}
// Fixes the handler order
FabricDecodeHandler decode = channel.pipeline().remove(FabricDecodeHandler.class);
FabricEncodeHandler encode = channel.pipeline().remove(FabricEncodeHandler.class);
channel.pipeline().addAfter("decompress", "via-decoder", decode);
channel.pipeline().addAfter("compress", "via-encoder", encode);
}
}