From 5754b075835db904fc8a5c7eff48db9b2b605f04 Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Wed, 14 Feb 2024 19:58:55 +0100 Subject: [PATCH] Fixed Via API usage --- .../java/net/raphimc/vialoader/netty/VLLegacyPipeline.java | 2 +- src/main/java/net/raphimc/vialoader/netty/VLPipeline.java | 2 +- src/main/java/net/raphimc/vialoader/util/VersionRange.java | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/raphimc/vialoader/netty/VLLegacyPipeline.java b/src/main/java/net/raphimc/vialoader/netty/VLLegacyPipeline.java index 90b95de..3a9aa35 100644 --- a/src/main/java/net/raphimc/vialoader/netty/VLLegacyPipeline.java +++ b/src/main/java/net/raphimc/vialoader/netty/VLLegacyPipeline.java @@ -58,7 +58,7 @@ public abstract class VLLegacyPipeline extends ChannelInboundHandlerAdapter { ctx.pipeline().addBefore(this.packetDecoderName(), VIA_DECODER_NAME, this.createViaDecoder()); ctx.pipeline().addBefore(this.packetEncoderName(), VIA_ENCODER_NAME, this.createViaEncoder()); - if (this.version.olderThanOrEquals(LegacyProtocolVersion.r1_6_4)) { + if (this.version.olderThanOrEqualTo(LegacyProtocolVersion.r1_6_4)) { this.user.getProtocolInfo().getPipeline().add(PreNettyBaseProtocol.INSTANCE); ctx.pipeline().addBefore(this.lengthSplitterName(), VIALEGACY_PRE_NETTY_LENGTH_PREPENDER_NAME, this.createViaLegacyPreNettyLengthPrepender()); ctx.pipeline().addBefore(this.lengthPrependerName(), VIALEGACY_PRE_NETTY_LENGTH_REMOVER_NAME, this.createViaLegacyPreNettyLengthRemover()); diff --git a/src/main/java/net/raphimc/vialoader/netty/VLPipeline.java b/src/main/java/net/raphimc/vialoader/netty/VLPipeline.java index cd1012d..fb348b2 100644 --- a/src/main/java/net/raphimc/vialoader/netty/VLPipeline.java +++ b/src/main/java/net/raphimc/vialoader/netty/VLPipeline.java @@ -55,7 +55,7 @@ public abstract class VLPipeline extends ChannelInboundHandlerAdapter { public void handlerAdded(ChannelHandlerContext ctx) { ctx.pipeline().addBefore(this.packetCodecName(), VIA_CODEC_NAME, this.createViaCodec()); - if (this.version.olderThanOrEquals(LegacyProtocolVersion.r1_6_4)) { + if (this.version.olderThanOrEqualTo(LegacyProtocolVersion.r1_6_4)) { this.user.getProtocolInfo().getPipeline().add(PreNettyBaseProtocol.INSTANCE); ctx.pipeline().addBefore(this.lengthCodecName(), VIALEGACY_PRE_NETTY_LENGTH_CODEC_NAME, this.createViaLegacyPreNettyLengthCodec()); } else if (this.version.equals(BedrockProtocolVersion.bedrockLatest)) { diff --git a/src/main/java/net/raphimc/vialoader/util/VersionRange.java b/src/main/java/net/raphimc/vialoader/util/VersionRange.java index f5f784d..56b6157 100644 --- a/src/main/java/net/raphimc/vialoader/util/VersionRange.java +++ b/src/main/java/net/raphimc/vialoader/util/VersionRange.java @@ -63,9 +63,9 @@ public class VersionRange { public boolean contains(final ProtocolVersion version) { if (this.ranges.stream().anyMatch(range -> range.contains(version))) return true; if (this.min == null && this.max == null) return true; - else if (this.min == null) return version.olderThanOrEquals(this.max); - else if (this.max == null) return version.newerThanOrEquals(this.min); - return version.newerThanOrEquals(this.min) && version.olderThanOrEquals(this.max); + else if (this.min == null) return version.olderThanOrEqualTo(this.max); + else if (this.max == null) return version.newerThanOrEqualTo(this.min); + return version.newerThanOrEqualTo(this.min) && version.olderThanOrEqualTo(this.max); } public ProtocolVersion getMin() {