GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

KQueue no longer needs to be shaded in on Spigot/Fabric

Browse source
This commit is contained in:
Camotoy 2023-04-06 19:54:22 -04:00
parent a62595aaa4
commit 8083f70435
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bootstrap/fabric/build.gradle.kts
View file

@ -68,10 +68,11 @@ tasks {
relocate("net.kyori", "org.geysermc.relocate.kyori") relocate("net.kyori", "org.geysermc.relocate.kyori")
dependencies { dependencies {
// Exclude everything EXCEPT KQueue and some DNS stuff required for HAProxyc // Exclude everything EXCEPT some DNS stuff required for HAProxy
exclude(dependency("io.netty:netty-transport-classes-epoll:.*")) exclude(dependency("io.netty:netty-transport-classes-epoll:.*"))
exclude(dependency("io.netty:netty-transport-native-epoll:.*")) exclude(dependency("io.netty:netty-transport-native-epoll:.*"))
exclude(dependency("io.netty:netty-transport-native-unix-common:.*")) exclude(dependency("io.netty:netty-transport-native-unix-common:.*"))
exclude(dependency("io.netty:netty-transport-classes-kqueue:.*"))
exclude(dependency("io.netty:netty-transport-native-kqueue:.*")) exclude(dependency("io.netty:netty-transport-native-kqueue:.*"))
exclude(dependency("io.netty:netty-handler:.*")) exclude(dependency("io.netty:netty-handler:.*"))
exclude(dependency("io.netty:netty-common:.*")) exclude(dependency("io.netty:netty-common:.*"))

2
bootstrap/spigot/build.gradle.kts
View file

@ -29,7 +29,6 @@ platformRelocate("com.fasterxml.jackson")
platformRelocate("net.kyori", "net.kyori.adventure.text.logger.slf4j.ComponentLogger") platformRelocate("net.kyori", "net.kyori.adventure.text.logger.slf4j.ComponentLogger")
platformRelocate("org.objectweb.asm") platformRelocate("org.objectweb.asm")
platformRelocate("me.lucko.commodore") platformRelocate("me.lucko.commodore")
platformRelocate("io.netty.channel.kqueue")
// These dependencies are already present on the platform // These dependencies are already present on the platform
provided(libs.viaversion) provided(libs.viaversion)
@ -50,6 +49,7 @@ tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
exclude(dependency("io.netty:netty-transport-classes-epoll:.*")) exclude(dependency("io.netty:netty-transport-classes-epoll:.*"))
exclude(dependency("io.netty:netty-transport-native-epoll:.*")) exclude(dependency("io.netty:netty-transport-native-epoll:.*"))
exclude(dependency("io.netty:netty-transport-native-unix-common:.*")) exclude(dependency("io.netty:netty-transport-native-unix-common:.*"))
exclude(dependency("io.netty:netty-transport-classes-kqueue:.*"))
exclude(dependency("io.netty:netty-transport-native-kqueue:.*")) exclude(dependency("io.netty:netty-transport-native-kqueue:.*"))
exclude(dependency("io.netty:netty-handler:.*")) exclude(dependency("io.netty:netty-handler:.*"))
exclude(dependency("io.netty:netty-common:.*")) exclude(dependency("io.netty:netty-common:.*"))

1
core/src/main/java/org/geysermc/geyser/network/GeyserServerInitializer.java
View file

@ -43,6 +43,7 @@ public class GeyserServerInitializer extends BedrockServerInitializer {
this.geyser = geyser; this.geyser = geyser;
} }
//TODO
/* /*
@Override @Override
public boolean onConnectionRequest(InetSocketAddress inetSocketAddress) { public boolean onConnectionRequest(InetSocketAddress inetSocketAddress) {

2
core/src/main/java/org/geysermc/geyser/network/netty/RakPingHandler.java
View file

@ -41,7 +41,7 @@ public class RakPingHandler extends SimpleChannelInboundHandler<RakPing> {
private final GeyserServer server; private final GeyserServer server;
@Override @Override
protected void channelRead0(ChannelHandlerContext ctx, RakPing msg) throws Exception { protected void channelRead0(ChannelHandlerContext ctx, RakPing msg) {
long guid = ctx.channel().config().getOption(RakChannelOption.RAK_GUID); long guid = ctx.channel().config().getOption(RakChannelOption.RAK_GUID);
RakPong pong = msg.reply(guid, this.server.onQuery(msg.getSender()).toByteBuf()); RakPong pong = msg.reply(guid, this.server.onQuery(msg.getSender()).toByteBuf());