Skip to content

Commit c58d7f9

Browse files
RaphiMCRaphiMC
committed
Cleaned up code
1 parent 7434671 commit c58d7f9

File tree

3 files changed

+29
-29
lines changed

3 files changed

+29
-29
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919

2020
public enum RakNetBackend {
2121

22-
SANDERTV_GO_RAKNET("[Go] Sandertv/go-raknet"), // https://github.com/Sandertv/go-raknet
22+
KASTLE_NETWORK("[Java] Kas-tle/Network (default)"), // https://github.com/Kas-tle/NetworkCompatible
2323
EXTREMEHEAT_FB_RAKNET("[C++] extremeheat/fb-raknet"), // https://github.com/extremeheat/fb-raknet
2424
CLOUDBURSTMC_NETWORK("[Java] CloudburstMC/Network"), // https://github.com/CloudburstMC/Network
25-
KASTLE_NETWORK("[Java] Kas-tle/Network (default)"), // https://github.com/Kas-tle/NetworkCompatible
25+
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-
WHIRVIS_JRAKNET("[Java] whirvis/JRakNet (bad)"), // https://github.com/telecran-telecrit/JRakNet
2827
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
2929
;
3030

3131
private final String displayName;

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import net.lenni0451.reflect.stream.RStream;
2424
import net.raphimc.raknetproviders.b23r0_rust_raknet.B23R0RustRakNet;
2525
import net.raphimc.raknetproviders.b23r0_rust_raknet.B23R0RustRakNetBedrockProxyConnection;
26-
import net.raphimc.raknetproviders.cloudburst_network.CloudburstNetworkBedrockProxyConnection;
26+
import net.raphimc.raknetproviders.cloudburstmc_network.CloudburstMcNetworkBedrockProxyConnection;
2727
import net.raphimc.raknetproviders.extremeheat_fb_raknet.ExtremeheatFbRakNet;
2828
import net.raphimc.raknetproviders.extremeheat_fb_raknet.ExtremeheatFbRakNetBedrockProxyConnection;
2929
import net.raphimc.raknetproviders.relativitymc_netty_raknet.RelativityMcNettyRakNetBedrockProxyConnection;
@@ -104,24 +104,18 @@ public Component getListCellRendererComponent(JList<?> list, Object value, int i
104104
public void onProxySessionCreation(final ProxySessionCreationEvent event) {
105105
if (event.getProxySession() instanceof BedrockProxyConnection bedrockProxyConnection && this.rakNetBackend.getSelectedItem() instanceof RakNetBackend backend) {
106106
switch (backend) {
107+
case KASTLE_NETWORK -> {
108+
// default implementation
109+
}
107110
case EXTREMEHEAT_FB_RAKNET -> {
108111
if (ExtremeheatFbRakNet.isLoaded()) {
109112
event.setProxySession(new ExtremeheatFbRakNetBedrockProxyConnection(Objects.cast(bedrockProxyConnection, ExtremeheatFbRakNetBedrockProxyConnection.class)));
110113
} else {
111114
Logger.LOGGER.warn("EXTREMEHEAT_FB_RAKNET is not supported on this system, falling back to KASTLE_NETWORK");
112115
}
113116
}
114-
case KASTLE_NETWORK -> {
115-
// default implementation
116-
}
117117
case CLOUDBURSTMC_NETWORK -> {
118-
event.setProxySession(new CloudburstNetworkBedrockProxyConnection(Objects.cast(bedrockProxyConnection, CloudburstNetworkBedrockProxyConnection.class)));
119-
}
120-
case RELATIVITYMC_NETTY_RAKNET -> {
121-
event.setProxySession(new RelativityMcNettyRakNetBedrockProxyConnection(Objects.cast(bedrockProxyConnection, RelativityMcNettyRakNetBedrockProxyConnection.class)));
122-
}
123-
case WHIRVIS_JRAKNET -> {
124-
event.setProxySession(new WhirvisJRakNetBedrockProxyConnection(Objects.cast(bedrockProxyConnection, WhirvisJRakNetBedrockProxyConnection.class)));
118+
event.setProxySession(new CloudburstMcNetworkBedrockProxyConnection(Objects.cast(bedrockProxyConnection, CloudburstMcNetworkBedrockProxyConnection.class)));
125119
}
126120
case SANDERTV_GO_RAKNET -> {
127121
if (SanderTvGoRakNet.isLoaded()) {
@@ -130,13 +124,19 @@ public void onProxySessionCreation(final ProxySessionCreationEvent event) {
130124
Logger.LOGGER.warn("SANDERTV_GO_RAKNET is not supported on this system, falling back to KASTLE_NETWORK");
131125
}
132126
}
127+
case RELATIVITYMC_NETTY_RAKNET -> {
128+
event.setProxySession(new RelativityMcNettyRakNetBedrockProxyConnection(Objects.cast(bedrockProxyConnection, RelativityMcNettyRakNetBedrockProxyConnection.class)));
129+
}
133130
case B23R0_RUST_RAKNET -> {
134131
if (B23R0RustRakNet.isLoaded()) {
135132
event.setProxySession(new B23R0RustRakNetBedrockProxyConnection(Objects.cast(bedrockProxyConnection, B23R0RustRakNetBedrockProxyConnection.class)));
136133
} else {
137134
Logger.LOGGER.warn("B23R0_RUST_RAKNET is not supported on this system, falling back to KASTLE_NETWORK");
138135
}
139136
}
137+
case WHIRVIS_JRAKNET -> {
138+
event.setProxySession(new WhirvisJRakNetBedrockProxyConnection(Objects.cast(bedrockProxyConnection, WhirvisJRakNetBedrockProxyConnection.class)));
139+
}
140140
}
141141
}
142142
}

src/main/java/net/raphimc/raknetproviders/cloudburst_network/CloudburstNetworkBedrockProxyConnection.java renamed to src/main/java/net/raphimc/raknetproviders/cloudburstmc_network/CloudburstMcNetworkBedrockProxyConnection.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package net.raphimc.raknetproviders.cloudburst_network;
18+
package net.raphimc.raknetproviders.cloudburstmc_network;
1919

2020
import com.viaversion.vialoader.netty.VLPipeline;
2121
import io.netty.bootstrap.Bootstrap;
@@ -32,18 +32,18 @@
3232
import net.raphimc.viaproxy.ViaProxy;
3333
import net.raphimc.viaproxy.proxy.session.BedrockProxyConnection;
3434
import net.raphimc.viaproxy.proxy.session.ProxyConnection;
35+
import org.cloudburstmc.netty.channel.raknet.RakPriority;
36+
import org.cloudburstmc.netty.channel.raknet.RakReliability;
37+
import org.cloudburstmc.netty.channel.raknet.packet.RakMessage;
3538
import org.cloudburstmc.upstream.netty.channel.raknet.RakChannelFactory;
36-
import org.cloudburstmc.upstream.netty.channel.raknet.RakPriority;
37-
import org.cloudburstmc.upstream.netty.channel.raknet.RakReliability;
3839
import org.cloudburstmc.upstream.netty.channel.raknet.config.RakChannelOption;
39-
import org.cloudburstmc.upstream.netty.channel.raknet.packet.RakMessage;
4040

4141
import java.util.List;
4242
import java.util.concurrent.ThreadLocalRandom;
4343

44-
public class CloudburstNetworkBedrockProxyConnection extends BedrockProxyConnection {
44+
public class CloudburstMcNetworkBedrockProxyConnection extends BedrockProxyConnection {
4545

46-
public CloudburstNetworkBedrockProxyConnection(final CloudburstNetworkBedrockProxyConnection bedrockProxyConnection) {
46+
public CloudburstMcNetworkBedrockProxyConnection(final CloudburstMcNetworkBedrockProxyConnection bedrockProxyConnection) {
4747
super(bedrockProxyConnection.channelInitializer, bedrockProxyConnection.getC2P());
4848
}
4949

@@ -74,23 +74,23 @@ public void initialize(TransportType transportType, Bootstrap bootstrap) {
7474
protected void initChannel(Channel channel) {
7575
channel.pipeline().addLast(channelInitializer);
7676

77-
channel.pipeline().addBefore(VLPipeline.VIABEDROCK_FRAME_ENCAPSULATION_HANDLER_NAME, "viabedrock-frame-converter", new MessageToMessageCodec<RakMessage, org.cloudburstmc.netty.channel.raknet.packet.RakMessage>() {
77+
channel.pipeline().addBefore(VLPipeline.VIABEDROCK_FRAME_ENCAPSULATION_HANDLER_NAME, "viabedrock-frame-converter", new MessageToMessageCodec<org.cloudburstmc.upstream.netty.channel.raknet.packet.RakMessage, RakMessage>() {
7878
@Override
79-
protected void encode(ChannelHandlerContext channelHandlerContext, org.cloudburstmc.netty.channel.raknet.packet.RakMessage rakMessage, List<Object> list) {
80-
list.add(new RakMessage(
79+
protected void encode(ChannelHandlerContext channelHandlerContext, RakMessage rakMessage, List<Object> list) {
80+
list.add(new org.cloudburstmc.upstream.netty.channel.raknet.packet.RakMessage(
8181
rakMessage.content().retain(),
82-
RakReliability.valueOf(rakMessage.reliability().name()),
83-
RakPriority.valueOf(rakMessage.priority().name()),
82+
org.cloudburstmc.upstream.netty.channel.raknet.RakReliability.valueOf(rakMessage.reliability().name()),
83+
org.cloudburstmc.upstream.netty.channel.raknet.RakPriority.valueOf(rakMessage.priority().name()),
8484
rakMessage.channel()
8585
));
8686
}
8787

8888
@Override
89-
protected void decode(ChannelHandlerContext channelHandlerContext, RakMessage rakMessage, List<Object> list) {
90-
list.add(new org.cloudburstmc.netty.channel.raknet.packet.RakMessage(
89+
protected void decode(ChannelHandlerContext channelHandlerContext, org.cloudburstmc.upstream.netty.channel.raknet.packet.RakMessage rakMessage, List<Object> list) {
90+
list.add(new RakMessage(
9191
rakMessage.content().retain(),
92-
org.cloudburstmc.netty.channel.raknet.RakReliability.valueOf(rakMessage.reliability().name()),
93-
org.cloudburstmc.netty.channel.raknet.RakPriority.valueOf(rakMessage.priority().name()),
92+
RakReliability.valueOf(rakMessage.reliability().name()),
93+
RakPriority.valueOf(rakMessage.priority().name()),
9494
rakMessage.channel()
9595
));
9696
}

0 commit comments

Comments
 (0)