|
26 | 26 | import io.netty.channel.ChannelPipeline;
|
27 | 27 |
|
28 | 28 | public class TrackingCompressionHandlerProvider extends CompressionHandlerProvider {
|
29 |
| - public static final String COMPRESS_HANDLER_NAME = "compress"; |
30 |
| - public static final String DECOMPRESS_HANDLER_NAME = "decompress"; |
31 | 29 |
|
32 | 30 | @Override
|
33 | 31 | public void onHandleLoginCompressionPacket(UserConnection user, int threshold) {
|
34 | 32 | final ChannelPipeline pipeline = user.getChannel().pipeline();
|
35 | 33 | if (user.isClientSide()) {
|
36 |
| - pipeline.addBefore(Via.getManager().getInjector().getEncoderName(), COMPRESS_HANDLER_NAME, getEncoder(threshold)); |
37 |
| - pipeline.addBefore(Via.getManager().getInjector().getDecoderName(), DECOMPRESS_HANDLER_NAME, getDecoder(threshold)); |
| 34 | + pipeline.addBefore(Via.getManager().getInjector().getEncoderName(), compressHandlerName(), getEncoder(threshold)); |
| 35 | + pipeline.addBefore(Via.getManager().getInjector().getDecoderName(), decompressHandlerName(), getDecoder(threshold)); |
38 | 36 | } else {
|
39 | 37 | setCompressionEnabled(user, true); // We need to remove compression for 1.7 clients
|
40 | 38 | }
|
41 | 39 | }
|
42 | 40 |
|
| 41 | + public String compressHandlerName() { |
| 42 | + return "compress"; |
| 43 | + } |
| 44 | + |
| 45 | + public String decompressHandlerName() { |
| 46 | + return "decompress"; |
| 47 | + } |
| 48 | + |
43 | 49 | @Override
|
44 | 50 | public void onTransformPacket(UserConnection user) {
|
45 | 51 | if (isCompressionEnabled(user)) {
|
46 | 52 | final ChannelPipeline pipeline = user.getChannel().pipeline();
|
47 | 53 |
|
48 | 54 | String compressor = null;
|
49 | 55 | String decompressor = null;
|
50 |
| - if (pipeline.get(COMPRESS_HANDLER_NAME) != null) { // ViaVersion |
51 |
| - compressor = COMPRESS_HANDLER_NAME; |
52 |
| - decompressor = DECOMPRESS_HANDLER_NAME; |
| 56 | + if (pipeline.get(compressHandlerName()) != null) { // ViaVersion |
| 57 | + compressor = compressHandlerName(); |
| 58 | + decompressor = decompressHandlerName(); |
53 | 59 | } else if (pipeline.get("compression-encoder") != null) { // Velocity
|
54 | 60 | compressor = "compression-encoder";
|
55 | 61 | decompressor = "compression-decoder";
|
|
0 commit comments