Skip to content

Commit 9790230

Browse files
committed
Updated ViaProxy API usage
1 parent 74d2b77 commit 9790230

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

src/main/java/net/raphimc/raknetproviders/b23r0_rust_raknet/B23R0RustRakNetBedrockProxyConnection.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
public class B23R0RustRakNetBedrockProxyConnection extends BedrockProxyConnection {
3030

3131
public B23R0RustRakNetBedrockProxyConnection(final B23R0RustRakNetBedrockProxyConnection bedrockProxyConnection) {
32-
super(bedrockProxyConnection.handlerSupplier, bedrockProxyConnection.channelInitializerSupplier, bedrockProxyConnection.getC2P());
32+
super(bedrockProxyConnection.channelInitializer, bedrockProxyConnection.getC2P());
3333
}
3434

3535
@Override
@@ -40,7 +40,7 @@ public void initialize(ChannelType channelType, Bootstrap bootstrap) {
4040
.channel(B23R0RustRakNetChannel.class)
4141
.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, ViaProxy.getConfig().getConnectTimeout())
4242
.attr(ProxyConnection.PROXY_CONNECTION_ATTRIBUTE_KEY, this)
43-
.handler(this.channelInitializerSupplier.apply(this.handlerSupplier));
43+
.handler(this.channelInitializer);
4444

4545
this.channelFuture = bootstrap.register().syncUninterruptibly();
4646
} else {

src/main/java/net/raphimc/raknetproviders/extremeheat_fb_raknet/ExtremeheatFbRakNetBedrockProxyConnection.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
public class ExtremeheatFbRakNetBedrockProxyConnection extends BedrockProxyConnection {
3030

3131
public ExtremeheatFbRakNetBedrockProxyConnection(final ExtremeheatFbRakNetBedrockProxyConnection bedrockProxyConnection) {
32-
super(bedrockProxyConnection.handlerSupplier, bedrockProxyConnection.channelInitializerSupplier, bedrockProxyConnection.getC2P());
32+
super(bedrockProxyConnection.channelInitializer, bedrockProxyConnection.getC2P());
3333
}
3434

3535
@Override
@@ -40,7 +40,7 @@ public void initialize(ChannelType channelType, Bootstrap bootstrap) {
4040
.channel(ExtremeheatFbRakNetChannel.class)
4141
.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, ViaProxy.getConfig().getConnectTimeout())
4242
.attr(ProxyConnection.PROXY_CONNECTION_ATTRIBUTE_KEY, this)
43-
.handler(this.channelInitializerSupplier.apply(this.handlerSupplier));
43+
.handler(this.channelInitializer);
4444

4545
this.channelFuture = bootstrap.register().syncUninterruptibly();
4646
} else {

src/main/java/net/raphimc/raknetproviders/relativitymc_netty_raknet/RelativityMcNettyRakNetBedrockProxyConnection.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
public class RelativityMcNettyRakNetBedrockProxyConnection extends BedrockProxyConnection {
4545

4646
public RelativityMcNettyRakNetBedrockProxyConnection(final RelativityMcNettyRakNetBedrockProxyConnection bedrockProxyConnection) {
47-
super(bedrockProxyConnection.handlerSupplier, bedrockProxyConnection.channelInitializerSupplier, bedrockProxyConnection.getC2P());
47+
super(bedrockProxyConnection.channelInitializer, bedrockProxyConnection.getC2P());
4848
}
4949

5050
@Override
@@ -61,8 +61,8 @@ public void initialize(ChannelType channelType, Bootstrap bootstrap) {
6161
@Override
6262
protected void initChannel(Channel channel) {
6363
final RakNetClientThreadedChannel rakChannel = (RakNetClientThreadedChannel) channel;
64-
rakChannel.config().setprotocolVersions(new int[]{11});
65-
channel.pipeline().addLast(channelInitializerSupplier.apply(handlerSupplier));
64+
rakChannel.config().setprotocolVersions(new int[]{ProtocolConstants.BEDROCK_RAKNET_PROTOCOL_VERSION});
65+
channel.pipeline().addLast(channelInitializer);
6666

6767
channel.pipeline().addBefore(VLPipeline.VIABEDROCK_FRAME_ENCAPSULATION_HANDLER_NAME, "viabedrock-frame-converter", new MessageToMessageCodec<FrameData, RakMessage>() {
6868
@Override

src/main/java/net/raphimc/raknetproviders/sandertv_go_raknet/SanderTvGoRakNetBedrockProxyConnection.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
public class SanderTvGoRakNetBedrockProxyConnection extends BedrockProxyConnection {
3030

3131
public SanderTvGoRakNetBedrockProxyConnection(final SanderTvGoRakNetBedrockProxyConnection bedrockProxyConnection) {
32-
super(bedrockProxyConnection.handlerSupplier, bedrockProxyConnection.channelInitializerSupplier, bedrockProxyConnection.getC2P());
32+
super(bedrockProxyConnection.channelInitializer, bedrockProxyConnection.getC2P());
3333
}
3434

3535
@Override
@@ -40,7 +40,7 @@ public void initialize(ChannelType channelType, Bootstrap bootstrap) {
4040
.channel(SanderTvGoRakNetChannel.class)
4141
.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, ViaProxy.getConfig().getConnectTimeout())
4242
.attr(ProxyConnection.PROXY_CONNECTION_ATTRIBUTE_KEY, this)
43-
.handler(this.channelInitializerSupplier.apply(this.handlerSupplier));
43+
.handler(this.channelInitializer);
4444

4545
this.channelFuture = bootstrap.register().syncUninterruptibly();
4646
} else {

src/main/java/net/raphimc/raknetproviders/whirvis_jraknet/WhirvisJRakNetBedrockProxyConnection.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
public class WhirvisJRakNetBedrockProxyConnection extends BedrockProxyConnection {
3030

3131
public WhirvisJRakNetBedrockProxyConnection(final WhirvisJRakNetBedrockProxyConnection bedrockProxyConnection) {
32-
super(bedrockProxyConnection.handlerSupplier, bedrockProxyConnection.channelInitializerSupplier, bedrockProxyConnection.getC2P());
32+
super(bedrockProxyConnection.channelInitializer, bedrockProxyConnection.getC2P());
3333
}
3434

3535
@Override
@@ -40,7 +40,7 @@ public void initialize(ChannelType channelType, Bootstrap bootstrap) {
4040
.channel(WhirvisJRakNetChannel.class)
4141
.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, ViaProxy.getConfig().getConnectTimeout())
4242
.attr(ProxyConnection.PROXY_CONNECTION_ATTRIBUTE_KEY, this)
43-
.handler(this.channelInitializerSupplier.apply(this.handlerSupplier));
43+
.handler(this.channelInitializer);
4444

4545
this.channelFuture = bootstrap.register().syncUninterruptibly();
4646
} else {

0 commit comments

Comments
 (0)