Upstream/ViaLoader
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaLoader.git synced 2025-02-16 01:31:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed potential issues when using ViaLoader serverside

Browse Source
This commit is contained in:
RaphiMC 2024-10-15 12:44:33 +02:00
parent 83462d813d
commit b0de353c82
No known key found for this signature in database
GPG Key ID: 0F6BB0657A03AC94
4 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -62,7 +62,7 @@ repositories {
``` ```
Here is an example dependency configuration for all components: Here is an example dependency configuration for all components:
```groovy ```groovy
implementation "com.viaversion:viaversion:5.0.4" implementation "com.viaversion:viaversion:5.0.5"
implementation "com.viaversion:viabackwards-common:5.0.4" implementation "com.viaversion:viabackwards-common:5.0.4"
implementation "com.viaversion:viarewind-common:4.0.3" implementation "com.viaversion:viarewind-common:4.0.3"
implementation "net.raphimc:ViaLegacy:3.0.3" implementation "net.raphimc:ViaLegacy:3.0.3"

2
build.gradle
View File

@ -50,7 +50,7 @@ repositories {
} }
dependencies { dependencies {
compileOnly "com.viaversion:viaversion-common:5.0.4" compileOnly "com.viaversion:viaversion-common:5.0.5"
compileOnly "com.viaversion:viabackwards-common:5.0.4" compileOnly "com.viaversion:viabackwards-common:5.0.4"
compileOnly "com.viaversion:viarewind-common:4.0.3" compileOnly "com.viaversion:viarewind-common:4.0.3"
compileOnly "net.raphimc:ViaLegacy:3.0.3" compileOnly "net.raphimc:ViaLegacy:3.0.3"

23
src/main/java/net/raphimc/vialoader/netty/VLLegacyPipeline.java
View File

@ -51,7 +51,6 @@ public abstract class VLLegacyPipeline extends ChannelInboundHandlerAdapter {
this(user, Via.getManager().getProviders().get(VersionProvider.class).getServerProtocol(user)); this(user, Via.getManager().getProviders().get(VersionProvider.class).getServerProtocol(user));
} }
@Deprecated
public VLLegacyPipeline(final UserConnection user, final ProtocolVersion version) { public VLLegacyPipeline(final UserConnection user, final ProtocolVersion version) {
this.user = user; this.user = user;
this.version = version; this.version = version;
@ -62,16 +61,18 @@ public abstract class VLLegacyPipeline extends ChannelInboundHandlerAdapter {
ctx.pipeline().addBefore(this.packetDecoderName(), VIA_DECODER_NAME, this.createViaDecoder()); ctx.pipeline().addBefore(this.packetDecoderName(), VIA_DECODER_NAME, this.createViaDecoder());
ctx.pipeline().addBefore(this.packetEncoderName(), VIA_ENCODER_NAME, this.createViaEncoder()); ctx.pipeline().addBefore(this.packetEncoderName(), VIA_ENCODER_NAME, this.createViaEncoder());
final ProtocolVersion r1_6_4 = ProtocolVersion.getProtocol(VersionType.RELEASE_INITIAL, 78); if (this.user.isClientSide()) {
if (r1_6_4.isKnown() && this.version.olderThanOrEqualTo(r1_6_4)) { final ProtocolVersion r1_6_4 = ProtocolVersion.getProtocol(VersionType.RELEASE_INITIAL, 78);
ctx.pipeline().addBefore(this.lengthSplitterName(), VIALEGACY_PRE_NETTY_LENGTH_PREPENDER_NAME, this.createViaLegacyPreNettyLengthPrepender()); if (r1_6_4.isKnown() && this.version.olderThanOrEqualTo(r1_6_4)) {
ctx.pipeline().addBefore(this.lengthPrependerName(), VIALEGACY_PRE_NETTY_LENGTH_REMOVER_NAME, this.createViaLegacyPreNettyLengthRemover()); ctx.pipeline().addBefore(this.lengthSplitterName(), VIALEGACY_PRE_NETTY_LENGTH_PREPENDER_NAME, this.createViaLegacyPreNettyLengthPrepender());
} else if (this.version.getName().startsWith("Bedrock")) { ctx.pipeline().addBefore(this.lengthPrependerName(), VIALEGACY_PRE_NETTY_LENGTH_REMOVER_NAME, this.createViaLegacyPreNettyLengthRemover());
ctx.pipeline().addBefore(this.lengthSplitterName(), VIABEDROCK_DISCONNECT_HANDLER_NAME, this.createViaBedrockDisconnectHandler()); } else if (this.version.getName().startsWith("Bedrock")) {
ctx.pipeline().addBefore(this.lengthSplitterName(), VIABEDROCK_FRAME_ENCAPSULATION_HANDLER_NAME, this.createViaBedrockFrameEncapsulationHandler()); ctx.pipeline().addBefore(this.lengthSplitterName(), VIABEDROCK_DISCONNECT_HANDLER_NAME, this.createViaBedrockDisconnectHandler());
this.replaceLengthSplitter(ctx, this.createViaBedrockBatchLengthCodec()); ctx.pipeline().addBefore(this.lengthSplitterName(), VIABEDROCK_FRAME_ENCAPSULATION_HANDLER_NAME, this.createViaBedrockFrameEncapsulationHandler());
ctx.pipeline().remove(this.lengthPrependerName()); this.replaceLengthSplitter(ctx, this.createViaBedrockBatchLengthCodec());
ctx.pipeline().addBefore(VIA_DECODER_NAME, VIABEDROCK_PACKET_ENCAPSULATION_HANDLER_NAME, this.createViaBedrockPacketEncapsulationHandler()); ctx.pipeline().remove(this.lengthPrependerName());
ctx.pipeline().addBefore(VIA_DECODER_NAME, VIABEDROCK_PACKET_ENCAPSULATION_HANDLER_NAME, this.createViaBedrockPacketEncapsulationHandler());
}
} }
} }

19
src/main/java/net/raphimc/vialoader/netty/VLPipeline.java
View File

@ -49,7 +49,6 @@ public abstract class VLPipeline extends ChannelInboundHandlerAdapter {
this(user, Via.getManager().getProviders().get(VersionProvider.class).getServerProtocol(user)); this(user, Via.getManager().getProviders().get(VersionProvider.class).getServerProtocol(user));
} }
@Deprecated
public VLPipeline(final UserConnection user, final ProtocolVersion version) { public VLPipeline(final UserConnection user, final ProtocolVersion version) {
this.user = user; this.user = user;
this.version = version; this.version = version;
@ -59,14 +58,16 @@ public abstract class VLPipeline extends ChannelInboundHandlerAdapter {
public void handlerAdded(ChannelHandlerContext ctx) { public void handlerAdded(ChannelHandlerContext ctx) {
ctx.pipeline().addBefore(this.packetCodecName(), VIA_CODEC_NAME, this.createViaCodec()); ctx.pipeline().addBefore(this.packetCodecName(), VIA_CODEC_NAME, this.createViaCodec());
final ProtocolVersion r1_6_4 = ProtocolVersion.getProtocol(VersionType.RELEASE_INITIAL, 78); if (this.user.isClientSide()) {
if (r1_6_4.isKnown() && this.version.olderThanOrEqualTo(r1_6_4)) { final ProtocolVersion r1_6_4 = ProtocolVersion.getProtocol(VersionType.RELEASE_INITIAL, 78);
ctx.pipeline().addBefore(this.lengthCodecName(), VIALEGACY_PRE_NETTY_LENGTH_CODEC_NAME, this.createViaLegacyPreNettyLengthCodec()); if (r1_6_4.isKnown() && this.version.olderThanOrEqualTo(r1_6_4)) {
} else if (this.version.getName().startsWith("Bedrock")) { ctx.pipeline().addBefore(this.lengthCodecName(), VIALEGACY_PRE_NETTY_LENGTH_CODEC_NAME, this.createViaLegacyPreNettyLengthCodec());
ctx.pipeline().addBefore(this.lengthCodecName(), VIABEDROCK_DISCONNECT_HANDLER_NAME, this.createViaBedrockDisconnectHandler()); } else if (this.version.getName().startsWith("Bedrock")) {
ctx.pipeline().addBefore(this.lengthCodecName(), VIABEDROCK_FRAME_ENCAPSULATION_HANDLER_NAME, this.createViaBedrockFrameEncapsulationHandler()); ctx.pipeline().addBefore(this.lengthCodecName(), VIABEDROCK_DISCONNECT_HANDLER_NAME, this.createViaBedrockDisconnectHandler());
this.replaceLengthCodec(ctx, this.createViaBedrockBatchLengthCodec()); ctx.pipeline().addBefore(this.lengthCodecName(), VIABEDROCK_FRAME_ENCAPSULATION_HANDLER_NAME, this.createViaBedrockFrameEncapsulationHandler());
ctx.pipeline().addBefore(VIA_CODEC_NAME, VIABEDROCK_PACKET_ENCAPSULATION_HANDLER_NAME, this.createViaBedrockPacketEncapsulationHandler()); this.replaceLengthCodec(ctx, this.createViaBedrockBatchLengthCodec());
ctx.pipeline().addBefore(VIA_CODEC_NAME, VIABEDROCK_PACKET_ENCAPSULATION_HANDLER_NAME, this.createViaBedrockPacketEncapsulationHandler());
}
} }
} }