Updated ViaProxy API usage

ViaVersionAddons · Dec 22, 2024 · 9790230 · 9790230
1 parent 74d2b77
commit 9790230
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/.../net/raphimc/raknetproviders/b23r0_rust_raknet/B23R0RustRakNetBedrockProxyConnection.java b/.../net/raphimc/raknetproviders/b23r0_rust_raknet/B23R0RustRakNetBedrockProxyConnection.java
@@ -29,7 +29,7 @@
 public class B23R0RustRakNetBedrockProxyConnection extends BedrockProxyConnection {
 
     public B23R0RustRakNetBedrockProxyConnection(final B23R0RustRakNetBedrockProxyConnection bedrockProxyConnection) {
-        super(bedrockProxyConnection.handlerSupplier, bedrockProxyConnection.channelInitializerSupplier, bedrockProxyConnection.getC2P());
+        super(bedrockProxyConnection.channelInitializer, bedrockProxyConnection.getC2P());
     }
 
     @Override
@@ -40,7 +40,7 @@ public void initialize(ChannelType channelType, Bootstrap bootstrap) {
                     .channel(B23R0RustRakNetChannel.class)
                     .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, ViaProxy.getConfig().getConnectTimeout())
                     .attr(ProxyConnection.PROXY_CONNECTION_ATTRIBUTE_KEY, this)
-                    .handler(this.channelInitializerSupplier.apply(this.handlerSupplier));
+                    .handler(this.channelInitializer);
 
             this.channelFuture = bootstrap.register().syncUninterruptibly();
         } else {

diff --git a/...himc/raknetproviders/extremeheat_fb_raknet/ExtremeheatFbRakNetBedrockProxyConnection.java b/...himc/raknetproviders/extremeheat_fb_raknet/ExtremeheatFbRakNetBedrockProxyConnection.java
@@ -29,7 +29,7 @@
 public class ExtremeheatFbRakNetBedrockProxyConnection extends BedrockProxyConnection {
 
     public ExtremeheatFbRakNetBedrockProxyConnection(final ExtremeheatFbRakNetBedrockProxyConnection bedrockProxyConnection) {
-        super(bedrockProxyConnection.handlerSupplier, bedrockProxyConnection.channelInitializerSupplier, bedrockProxyConnection.getC2P());
+        super(bedrockProxyConnection.channelInitializer, bedrockProxyConnection.getC2P());
     }
 
     @Override
@@ -40,7 +40,7 @@ public void initialize(ChannelType channelType, Bootstrap bootstrap) {
                     .channel(ExtremeheatFbRakNetChannel.class)
                     .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, ViaProxy.getConfig().getConnectTimeout())
                     .attr(ProxyConnection.PROXY_CONNECTION_ATTRIBUTE_KEY, this)
-                    .handler(this.channelInitializerSupplier.apply(this.handlerSupplier));
+                    .handler(this.channelInitializer);
 
             this.channelFuture = bootstrap.register().syncUninterruptibly();
         } else {

diff --git a/...netproviders/relativitymc_netty_raknet/RelativityMcNettyRakNetBedrockProxyConnection.java b/...netproviders/relativitymc_netty_raknet/RelativityMcNettyRakNetBedrockProxyConnection.java
@@ -44,7 +44,7 @@
 public class RelativityMcNettyRakNetBedrockProxyConnection extends BedrockProxyConnection {
 
     public RelativityMcNettyRakNetBedrockProxyConnection(final RelativityMcNettyRakNetBedrockProxyConnection bedrockProxyConnection) {
-        super(bedrockProxyConnection.handlerSupplier, bedrockProxyConnection.channelInitializerSupplier, bedrockProxyConnection.getC2P());
+        super(bedrockProxyConnection.channelInitializer, bedrockProxyConnection.getC2P());
     }
 
     @Override
@@ -61,8 +61,8 @@ public void initialize(ChannelType channelType, Bootstrap bootstrap) {
                         @Override
                         protected void initChannel(Channel channel) {
                             final RakNetClientThreadedChannel rakChannel = (RakNetClientThreadedChannel) channel;
-                            rakChannel.config().setprotocolVersions(new int[]{11});
-                            channel.pipeline().addLast(channelInitializerSupplier.apply(handlerSupplier));
+                            rakChannel.config().setprotocolVersions(new int[]{ProtocolConstants.BEDROCK_RAKNET_PROTOCOL_VERSION});
+                            channel.pipeline().addLast(channelInitializer);
 
                             channel.pipeline().addBefore(VLPipeline.VIABEDROCK_FRAME_ENCAPSULATION_HANDLER_NAME, "viabedrock-frame-converter", new MessageToMessageCodec<FrameData, RakMessage>() {
                                 @Override

diff --git a/...et/raphimc/raknetproviders/sandertv_go_raknet/SanderTvGoRakNetBedrockProxyConnection.java b/...et/raphimc/raknetproviders/sandertv_go_raknet/SanderTvGoRakNetBedrockProxyConnection.java
@@ -29,7 +29,7 @@
 public class SanderTvGoRakNetBedrockProxyConnection extends BedrockProxyConnection {
 
     public SanderTvGoRakNetBedrockProxyConnection(final SanderTvGoRakNetBedrockProxyConnection bedrockProxyConnection) {
-        super(bedrockProxyConnection.handlerSupplier, bedrockProxyConnection.channelInitializerSupplier, bedrockProxyConnection.getC2P());
+        super(bedrockProxyConnection.channelInitializer, bedrockProxyConnection.getC2P());
     }
 
     @Override
@@ -40,7 +40,7 @@ public void initialize(ChannelType channelType, Bootstrap bootstrap) {
                     .channel(SanderTvGoRakNetChannel.class)
                     .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, ViaProxy.getConfig().getConnectTimeout())
                     .attr(ProxyConnection.PROXY_CONNECTION_ATTRIBUTE_KEY, this)
-                    .handler(this.channelInitializerSupplier.apply(this.handlerSupplier));
+                    .handler(this.channelInitializer);
 
             this.channelFuture = bootstrap.register().syncUninterruptibly();
         } else {

diff --git a/...ava/net/raphimc/raknetproviders/whirvis_jraknet/WhirvisJRakNetBedrockProxyConnection.java b/...ava/net/raphimc/raknetproviders/whirvis_jraknet/WhirvisJRakNetBedrockProxyConnection.java
@@ -29,7 +29,7 @@
 public class WhirvisJRakNetBedrockProxyConnection extends BedrockProxyConnection {
 
     public WhirvisJRakNetBedrockProxyConnection(final WhirvisJRakNetBedrockProxyConnection bedrockProxyConnection) {
-        super(bedrockProxyConnection.handlerSupplier, bedrockProxyConnection.channelInitializerSupplier, bedrockProxyConnection.getC2P());
+        super(bedrockProxyConnection.channelInitializer, bedrockProxyConnection.getC2P());
     }
 
     @Override
@@ -40,7 +40,7 @@ public void initialize(ChannelType channelType, Bootstrap bootstrap) {
                     .channel(WhirvisJRakNetChannel.class)
                     .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, ViaProxy.getConfig().getConnectTimeout())
                     .attr(ProxyConnection.PROXY_CONNECTION_ATTRIBUTE_KEY, this)
-                    .handler(this.channelInitializerSupplier.apply(this.handlerSupplier));
+                    .handler(this.channelInitializer);
 
             this.channelFuture = bootstrap.register().syncUninterruptibly();
         } else {