Skip to content

Commit 4a97dbc

Browse files
committed
Switch to better RakNet library
1 parent 8528d51 commit 4a97dbc

File tree

5 files changed

+13
-29
lines changed

5 files changed

+13
-29
lines changed

build.gradle

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,6 @@ repositories {
2626
includeGroupByRegex "net\\.raphimc(\\..+)?"
2727
}
2828
}
29-
maven {
30-
name = "OpenCollab Releases"
31-
url = "https://repo.opencollab.dev/maven-releases"
32-
33-
content {
34-
includeGroupByRegex "org\\.cloudburstmc(\\..+)?"
35-
}
36-
}
37-
maven {
38-
name = "OpenCollab Snapshots"
39-
url = "https://repo.opencollab.dev/maven-snapshots"
40-
41-
content {
42-
includeGroupByRegex "org\\.cloudburstmc(\\..+)?"
43-
}
44-
}
4529
maven {
4630
name = "Minecraft Libraries"
4731
url = "https://libraries.minecraft.net"
@@ -67,7 +51,7 @@ dependencies {
6751
compileOnly "net.raphimc:ViaLegacy:3.0.11"
6852
compileOnly "com.viaversion:viaaprilfools-common:4.0.5"
6953
compileOnly "net.raphimc:ViaBedrock:0.0.24-SNAPSHOT"
70-
compileOnly "org.cloudburstmc.netty:netty-transport-raknet:1.0.0.CR3-SNAPSHOT"
54+
compileOnly "dev.kastle.netty:netty-transport-raknet:1.4.0"
7155

7256
api "com.google.guava:guava:33.5.0-jre"
7357
api "org.slf4j:slf4j-api:2.0.17"

src/main/java/com/viaversion/vialoader/netty/VLLegacyPipeline.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
*/
2121
package com.viaversion.vialoader.netty;
2222

23+
import com.viaversion.vialoader.netty.viabedrock.DisconnectHandler;
24+
import com.viaversion.vialoader.netty.viabedrock.RakNetMessageEncapsulationCodec;
2325
import com.viaversion.viaversion.api.Via;
2426
import com.viaversion.viaversion.api.connection.UserConnection;
2527
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
@@ -32,8 +34,6 @@
3234
import net.raphimc.viabedrock.netty.PacketEncapsulationCodec;
3335
import net.raphimc.vialegacy.netty.PreNettyLengthPrepender;
3436
import net.raphimc.vialegacy.netty.PreNettyLengthRemover;
35-
import com.viaversion.vialoader.netty.viabedrock.DisconnectHandler;
36-
import com.viaversion.vialoader.netty.viabedrock.RakMessageEncapsulationCodec;
3737

3838
public abstract class VLLegacyPipeline extends ChannelInboundHandlerAdapter {
3939

@@ -82,7 +82,7 @@ public void handlerAdded(ChannelHandlerContext ctx) {
8282
@Override
8383
public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
8484
if (CompressionReorderEvent.INSTANCE.equals(evt)) {
85-
final int decoderIndex = ctx.pipeline().names().indexOf(decompressName());
85+
final int decoderIndex = ctx.pipeline().names().indexOf(this.decompressName());
8686
if (decoderIndex == -1) return;
8787

8888
if (decoderIndex > ctx.pipeline().names().indexOf(VIA_DECODER_NAME)) {
@@ -92,8 +92,8 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
9292
ctx.pipeline().remove(decoder);
9393
ctx.pipeline().remove(encoder);
9494

95-
ctx.pipeline().addAfter(decompressName(), VIA_DECODER_NAME, decoder);
96-
ctx.pipeline().addAfter(compressName(), VIA_ENCODER_NAME, encoder);
95+
ctx.pipeline().addAfter(this.decompressName(), VIA_DECODER_NAME, decoder);
96+
ctx.pipeline().addAfter(this.compressName(), VIA_ENCODER_NAME, encoder);
9797
}
9898
}
9999

@@ -121,7 +121,7 @@ protected ChannelHandler createViaBedrockDisconnectHandler() {
121121
}
122122

123123
protected ChannelHandler createViaBedrockFrameEncapsulationHandler() {
124-
return new RakMessageEncapsulationCodec();
124+
return new RakNetMessageEncapsulationCodec();
125125
}
126126

127127
protected ChannelHandler createViaBedrockBatchLengthCodec() {

src/main/java/com/viaversion/vialoader/netty/VLPipeline.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
*/
2121
package com.viaversion.vialoader.netty;
2222

23+
import com.viaversion.vialoader.netty.viabedrock.DisconnectHandler;
24+
import com.viaversion.vialoader.netty.viabedrock.RakNetMessageEncapsulationCodec;
2325
import com.viaversion.viaversion.api.Via;
2426
import com.viaversion.viaversion.api.connection.UserConnection;
2527
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
@@ -32,8 +34,6 @@
3234
import net.raphimc.viabedrock.netty.BatchLengthCodec;
3335
import net.raphimc.viabedrock.netty.PacketEncapsulationCodec;
3436
import net.raphimc.vialegacy.netty.PreNettyLengthCodec;
35-
import com.viaversion.vialoader.netty.viabedrock.DisconnectHandler;
36-
import com.viaversion.vialoader.netty.viabedrock.RakMessageEncapsulationCodec;
3737

3838
public abstract class VLPipeline extends ChannelInboundHandlerAdapter {
3939

@@ -100,7 +100,7 @@ protected ChannelHandler createViaBedrockDisconnectHandler() {
100100
}
101101

102102
protected ChannelHandler createViaBedrockFrameEncapsulationHandler() {
103-
return new RakMessageEncapsulationCodec();
103+
return new RakNetMessageEncapsulationCodec();
104104
}
105105

106106
protected ChannelHandler createViaBedrockBatchLengthCodec() {

src/main/java/com/viaversion/vialoader/netty/viabedrock/RakMessageEncapsulationCodec.java renamed to src/main/java/com/viaversion/vialoader/netty/viabedrock/RakNetMessageEncapsulationCodec.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
import java.util.List;
3232

33-
public class RakMessageEncapsulationCodec extends MessageToMessageCodec<RakMessage, ByteBuf> {
33+
public class RakNetMessageEncapsulationCodec extends MessageToMessageCodec<RakMessage, ByteBuf> {
3434

3535
private static final int FRAME_ID = 0xFE;
3636

src/main/java/com/viaversion/vialoader/netty/viabedrock/PingEncapsulationCodec.java renamed to src/main/java/com/viaversion/vialoader/netty/viabedrock/RakNetPingEncapsulationCodec.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
import java.net.InetSocketAddress;
3131
import java.util.List;
3232

33-
public class PingEncapsulationCodec extends MessageToMessageCodec<RakPong, ByteBuf> {
33+
public class RakNetPingEncapsulationCodec extends MessageToMessageCodec<RakPong, ByteBuf> {
3434

3535
private final InetSocketAddress remoteAddress;
3636

37-
public PingEncapsulationCodec(final InetSocketAddress remoteAddress) {
37+
public RakNetPingEncapsulationCodec(final InetSocketAddress remoteAddress) {
3838
this.remoteAddress = remoteAddress;
3939
}
4040

0 commit comments

Comments
 (0)