From 33a63f55fbe6ebec7b28bb814b1c8431fc36f9e5 Mon Sep 17 00:00:00 2001
From: RaphiMC <50594595+RaphiMC@users.noreply.github.com>
Date: Fri, 23 Aug 2024 15:06:39 +0200
Subject: [PATCH] Updated Via API usage

---
 build.gradle                                                  | 4 ++--
 .../java/net/raphimc/vialoader/netty/VLLegacyPipeline.java    | 4 ----
 src/main/java/net/raphimc/vialoader/netty/VLPipeline.java     | 4 ----
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 11905e2..19cb1e6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ repositories {
 
 dependencies {
     compileOnly "com.viaversion:viaversion-common:5.0.4-SNAPSHOT"
-    compileOnly "com.viaversion:viabackwards-common:5.0.3"
-    compileOnly "com.viaversion:viarewind-common:4.0.2"
+    compileOnly "com.viaversion:viabackwards-common:5.0.4-SNAPSHOT"
+    compileOnly "com.viaversion:viarewind-common:4.0.3-SNAPSHOT"
     compileOnly "net.raphimc:ViaLegacy:3.0.3-SNAPSHOT"
     compileOnly "net.raphimc:viaaprilfools-common:3.0.2-SNAPSHOT"
     compileOnly "net.raphimc:ViaBedrock:0.0.11-SNAPSHOT"
diff --git a/src/main/java/net/raphimc/vialoader/netty/VLLegacyPipeline.java b/src/main/java/net/raphimc/vialoader/netty/VLLegacyPipeline.java
index 21b47a0..120ce4c 100644
--- a/src/main/java/net/raphimc/vialoader/netty/VLLegacyPipeline.java
+++ b/src/main/java/net/raphimc/vialoader/netty/VLLegacyPipeline.java
@@ -25,10 +25,8 @@ import com.viaversion.viaversion.api.protocol.version.VersionType;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
-import net.raphimc.viabedrock.api.protocol.BedrockBaseProtocol;
 import net.raphimc.viabedrock.netty.BatchLengthCodec;
 import net.raphimc.viabedrock.netty.PacketEncapsulationCodec;
-import net.raphimc.vialegacy.api.protocol.PreNettyBaseProtocol;
 import net.raphimc.vialegacy.netty.PreNettyLengthPrepender;
 import net.raphimc.vialegacy.netty.PreNettyLengthRemover;
 import net.raphimc.vialoader.netty.viabedrock.DisconnectHandler;
@@ -66,11 +64,9 @@ public abstract class VLLegacyPipeline extends ChannelInboundHandlerAdapter {
 
         final ProtocolVersion r1_6_4 = ProtocolVersion.getProtocol(VersionType.RELEASE_INITIAL, 78);
         if (r1_6_4.isKnown() && this.version.olderThanOrEqualTo(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());
         } else if (this.version.getName().startsWith("Bedrock")) {
-            this.user.getProtocolInfo().getPipeline().add(BedrockBaseProtocol.INSTANCE);
             ctx.pipeline().addBefore(this.lengthSplitterName(), VIABEDROCK_DISCONNECT_HANDLER_NAME, this.createViaBedrockDisconnectHandler());
             ctx.pipeline().addBefore(this.lengthSplitterName(), VIABEDROCK_FRAME_ENCAPSULATION_HANDLER_NAME, this.createViaBedrockFrameEncapsulationHandler());
             this.replaceLengthSplitter(ctx, this.createViaBedrockBatchLengthCodec());
diff --git a/src/main/java/net/raphimc/vialoader/netty/VLPipeline.java b/src/main/java/net/raphimc/vialoader/netty/VLPipeline.java
index 40e3aa9..1f358d1 100644
--- a/src/main/java/net/raphimc/vialoader/netty/VLPipeline.java
+++ b/src/main/java/net/raphimc/vialoader/netty/VLPipeline.java
@@ -26,10 +26,8 @@ import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.channel.ChannelPipeline;
-import net.raphimc.viabedrock.api.protocol.BedrockBaseProtocol;
 import net.raphimc.viabedrock.netty.BatchLengthCodec;
 import net.raphimc.viabedrock.netty.PacketEncapsulationCodec;
-import net.raphimc.vialegacy.api.protocol.PreNettyBaseProtocol;
 import net.raphimc.vialegacy.netty.PreNettyLengthCodec;
 import net.raphimc.vialoader.netty.viabedrock.DisconnectHandler;
 import net.raphimc.vialoader.netty.viabedrock.RakMessageEncapsulationCodec;
@@ -63,10 +61,8 @@ public abstract class VLPipeline extends ChannelInboundHandlerAdapter {
 
         final ProtocolVersion r1_6_4 = ProtocolVersion.getProtocol(VersionType.RELEASE_INITIAL, 78);
         if (r1_6_4.isKnown() && this.version.olderThanOrEqualTo(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.getName().startsWith("Bedrock")) {
-            this.user.getProtocolInfo().getPipeline().add(BedrockBaseProtocol.INSTANCE);
             ctx.pipeline().addBefore(this.lengthCodecName(), VIABEDROCK_DISCONNECT_HANDLER_NAME, this.createViaBedrockDisconnectHandler());
             ctx.pipeline().addBefore(this.lengthCodecName(), VIABEDROCK_FRAME_ENCAPSULATION_HANDLER_NAME, this.createViaBedrockFrameEncapsulationHandler());
             this.replaceLengthCodec(ctx, this.createViaBedrockBatchLengthCodec());