Skip to content

Commit ca68539

Browse files
committed
Removed discontinued RakNet backends
1 parent 9c69bde commit ca68539

15 files changed

Lines changed: 380 additions & 429 deletions

build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ dependencies {
4545

4646
// For dependency sources, see RakNetBackend class
4747
includeInJar "com.github.RelativityMC.netty-raknet:netty-raknet-client:15536296c2"
48-
includeInJar("com.github.telecran-telecrit:JRakNet:d757e139ce") {
49-
exclude group: "org.apache.logging.log4j"
50-
exclude group: "io.netty"
51-
}
5248
repackagedIncludeInJar("org.cloudburstmc.netty:netty-transport-raknet:1.0.0.CR3-20251031.125212-22") {
5349
transitive = false
5450
}

src/main/java/net/raphimc/raknetproviders/RakNetBackend.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ public enum RakNetBackend {
2424
CLOUDBURSTMC_NETWORK("[Java] CloudburstMC/Network"), // https://github.com/CloudburstMC/Network
2525
SANDERTV_GO_RAKNET("[Go] Sandertv/go-raknet"), // https://github.com/Sandertv/go-raknet
2626
RELATIVITYMC_NETTY_RAKNET("[Java] RelativityMC/netty-raknet"), // https://github.com/RelativityMC/netty-raknet
27-
B23R0_RUST_RAKNET("[Rust] b23r0/rust-raknet"), // https://github.com/b23r0/rust-raknet
28-
WHIRVIS_JRAKNET("[Java] whirvis/JRakNet (bad)"), // https://github.com/telecran-telecrit/JRakNet
2927
;
3028

3129
private final String displayName;

src/main/java/net/raphimc/raknetproviders/RakNetProviders.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,12 @@
2121
import net.lenni0451.lambdaevents.EventHandler;
2222
import net.lenni0451.reflect.Objects;
2323
import net.lenni0451.reflect.stream.RStream;
24-
import net.raphimc.raknetproviders.b23r0_rust_raknet.B23R0RustRakNet;
25-
import net.raphimc.raknetproviders.b23r0_rust_raknet.B23R0RustRakNetBedrockProxyConnection;
2624
import net.raphimc.raknetproviders.cloudburstmc_network.CloudburstMcNetworkBedrockProxyConnection;
2725
import net.raphimc.raknetproviders.extremeheat_fb_raknet.ExtremeheatFbRakNet;
2826
import net.raphimc.raknetproviders.extremeheat_fb_raknet.ExtremeheatFbRakNetBedrockProxyConnection;
2927
import net.raphimc.raknetproviders.relativitymc_netty_raknet.RelativityMcNettyRakNetBedrockProxyConnection;
3028
import net.raphimc.raknetproviders.sandertv_go_raknet.SanderTvGoRakNet;
3129
import net.raphimc.raknetproviders.sandertv_go_raknet.SanderTvGoRakNetBedrockProxyConnection;
32-
import net.raphimc.raknetproviders.whirvis_jraknet.WhirvisJRakNetBedrockProxyConnection;
3330
import net.raphimc.viabedrock.protocol.data.ProtocolConstants;
3431
import net.raphimc.viaproxy.ViaProxy;
3532
import net.raphimc.viaproxy.plugins.ViaProxyPlugin;
@@ -127,16 +124,6 @@ public void onProxySessionCreation(final ProxySessionCreationEvent event) {
127124
case RELATIVITYMC_NETTY_RAKNET -> {
128125
event.setProxySession(new RelativityMcNettyRakNetBedrockProxyConnection(Objects.cast(bedrockProxyConnection, RelativityMcNettyRakNetBedrockProxyConnection.class)));
129126
}
130-
case B23R0_RUST_RAKNET -> {
131-
if (B23R0RustRakNet.isLoaded()) {
132-
event.setProxySession(new B23R0RustRakNetBedrockProxyConnection(Objects.cast(bedrockProxyConnection, B23R0RustRakNetBedrockProxyConnection.class)));
133-
} else {
134-
Logger.LOGGER.warn("B23R0_RUST_RAKNET is not supported on this system, falling back to KASTLE_NETWORK");
135-
}
136-
}
137-
case WHIRVIS_JRAKNET -> {
138-
event.setProxySession(new WhirvisJRakNetBedrockProxyConnection(Objects.cast(bedrockProxyConnection, WhirvisJRakNetBedrockProxyConnection.class)));
139-
}
140127
}
141128
}
142129
}

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

Lines changed: 0 additions & 55 deletions
This file was deleted.

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

Lines changed: 0 additions & 36 deletions
This file was deleted.

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

Lines changed: 0 additions & 129 deletions
This file was deleted.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import io.netty.channel.ChannelOutboundBuffer;
2323
import io.netty.channel.ConnectTimeoutException;
2424
import io.netty.util.internal.StringUtil;
25-
import net.raphimc.raknetproviders.SimpleOioMessageChannel;
25+
import net.raphimc.raknetproviders.util.SimpleOioMessageChannel;
2626
import org.cloudburstmc.netty.channel.raknet.RakConstants;
2727
import org.cloudburstmc.netty.channel.raknet.packet.RakMessage;
2828

@@ -33,7 +33,7 @@
3333

3434
public class ExtremeheatFbRakNetChannel extends SimpleOioMessageChannel {
3535

36-
protected boolean active = false;
36+
private boolean active = false;
3737

3838
private Pointer rakPeer;
3939

@@ -129,7 +129,7 @@ protected void doClose() throws Exception {
129129

130130
@Override
131131
public boolean isActive() {
132-
return this.active && this.open;
132+
return this.isOpen() && this.active;
133133
}
134134

135135
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import io.netty.buffer.ByteBuf;
2424
import io.netty.channel.ChannelOutboundBuffer;
2525
import io.netty.util.internal.StringUtil;
26-
import net.raphimc.raknetproviders.SimpleOioMessageChannel;
26+
import net.raphimc.raknetproviders.util.SimpleOioMessageChannel;
2727
import org.cloudburstmc.netty.channel.raknet.packet.RakMessage;
2828

2929
import java.net.ConnectException;
@@ -33,7 +33,7 @@
3333

3434
public class SanderTvGoRakNetChannel extends SimpleOioMessageChannel {
3535

36-
protected boolean active = false;
36+
private boolean active = false;
3737

3838
private Pointer connection;
3939

@@ -111,7 +111,7 @@ protected void doClose() throws Exception {
111111

112112
@Override
113113
public boolean isActive() {
114-
return this.active && this.open;
114+
return this.isOpen() && this.active;
115115
}
116116

117117
}

0 commit comments

Comments
 (0)