Skip to content

Commit 33a63f5

Browse files
committed
Updated Via API usage
1 parent 02d1aba commit 33a63f5

File tree

3 files changed

+2
-10
lines changed

3 files changed

+2
-10
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ repositories {
3939

4040
dependencies {
4141
compileOnly "com.viaversion:viaversion-common:5.0.4-SNAPSHOT"
42-
compileOnly "com.viaversion:viabackwards-common:5.0.3"
43-
compileOnly "com.viaversion:viarewind-common:4.0.2"
42+
compileOnly "com.viaversion:viabackwards-common:5.0.4-SNAPSHOT"
43+
compileOnly "com.viaversion:viarewind-common:4.0.3-SNAPSHOT"
4444
compileOnly "net.raphimc:ViaLegacy:3.0.3-SNAPSHOT"
4545
compileOnly "net.raphimc:viaaprilfools-common:3.0.2-SNAPSHOT"
4646
compileOnly "net.raphimc:ViaBedrock:0.0.11-SNAPSHOT"

src/main/java/net/raphimc/vialoader/netty/VLLegacyPipeline.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@
2525
import io.netty.channel.ChannelHandler;
2626
import io.netty.channel.ChannelHandlerContext;
2727
import io.netty.channel.ChannelInboundHandlerAdapter;
28-
import net.raphimc.viabedrock.api.protocol.BedrockBaseProtocol;
2928
import net.raphimc.viabedrock.netty.BatchLengthCodec;
3029
import net.raphimc.viabedrock.netty.PacketEncapsulationCodec;
31-
import net.raphimc.vialegacy.api.protocol.PreNettyBaseProtocol;
3230
import net.raphimc.vialegacy.netty.PreNettyLengthPrepender;
3331
import net.raphimc.vialegacy.netty.PreNettyLengthRemover;
3432
import net.raphimc.vialoader.netty.viabedrock.DisconnectHandler;
@@ -66,11 +64,9 @@ public void handlerAdded(ChannelHandlerContext ctx) {
6664

6765
final ProtocolVersion r1_6_4 = ProtocolVersion.getProtocol(VersionType.RELEASE_INITIAL, 78);
6866
if (r1_6_4.isKnown() && this.version.olderThanOrEqualTo(r1_6_4)) {
69-
this.user.getProtocolInfo().getPipeline().add(PreNettyBaseProtocol.INSTANCE);
7067
ctx.pipeline().addBefore(this.lengthSplitterName(), VIALEGACY_PRE_NETTY_LENGTH_PREPENDER_NAME, this.createViaLegacyPreNettyLengthPrepender());
7168
ctx.pipeline().addBefore(this.lengthPrependerName(), VIALEGACY_PRE_NETTY_LENGTH_REMOVER_NAME, this.createViaLegacyPreNettyLengthRemover());
7269
} else if (this.version.getName().startsWith("Bedrock")) {
73-
this.user.getProtocolInfo().getPipeline().add(BedrockBaseProtocol.INSTANCE);
7470
ctx.pipeline().addBefore(this.lengthSplitterName(), VIABEDROCK_DISCONNECT_HANDLER_NAME, this.createViaBedrockDisconnectHandler());
7571
ctx.pipeline().addBefore(this.lengthSplitterName(), VIABEDROCK_FRAME_ENCAPSULATION_HANDLER_NAME, this.createViaBedrockFrameEncapsulationHandler());
7672
this.replaceLengthSplitter(ctx, this.createViaBedrockBatchLengthCodec());

src/main/java/net/raphimc/vialoader/netty/VLPipeline.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@
2626
import io.netty.channel.ChannelHandlerContext;
2727
import io.netty.channel.ChannelInboundHandlerAdapter;
2828
import io.netty.channel.ChannelPipeline;
29-
import net.raphimc.viabedrock.api.protocol.BedrockBaseProtocol;
3029
import net.raphimc.viabedrock.netty.BatchLengthCodec;
3130
import net.raphimc.viabedrock.netty.PacketEncapsulationCodec;
32-
import net.raphimc.vialegacy.api.protocol.PreNettyBaseProtocol;
3331
import net.raphimc.vialegacy.netty.PreNettyLengthCodec;
3432
import net.raphimc.vialoader.netty.viabedrock.DisconnectHandler;
3533
import net.raphimc.vialoader.netty.viabedrock.RakMessageEncapsulationCodec;
@@ -63,10 +61,8 @@ public void handlerAdded(ChannelHandlerContext ctx) {
6361

6462
final ProtocolVersion r1_6_4 = ProtocolVersion.getProtocol(VersionType.RELEASE_INITIAL, 78);
6563
if (r1_6_4.isKnown() && this.version.olderThanOrEqualTo(r1_6_4)) {
66-
this.user.getProtocolInfo().getPipeline().add(PreNettyBaseProtocol.INSTANCE);
6764
ctx.pipeline().addBefore(this.lengthCodecName(), VIALEGACY_PRE_NETTY_LENGTH_CODEC_NAME, this.createViaLegacyPreNettyLengthCodec());
6865
} else if (this.version.getName().startsWith("Bedrock")) {
69-
this.user.getProtocolInfo().getPipeline().add(BedrockBaseProtocol.INSTANCE);
7066
ctx.pipeline().addBefore(this.lengthCodecName(), VIABEDROCK_DISCONNECT_HANDLER_NAME, this.createViaBedrockDisconnectHandler());
7167
ctx.pipeline().addBefore(this.lengthCodecName(), VIABEDROCK_FRAME_ENCAPSULATION_HANDLER_NAME, this.createViaBedrockFrameEncapsulationHandler());
7268
this.replaceLengthCodec(ctx, this.createViaBedrockBatchLengthCodec());

0 commit comments

Comments
 (0)