diff --git a/build.gradle b/build.gradle index b14dbb6..868a194 100644 --- a/build.gradle +++ b/build.gradle @@ -14,13 +14,13 @@ repositories { dependencies { - compileOnly("org.geysermc.geyser:core:2.9.4-SNAPSHOT") { + compileOnly("org.geysermc.geyser:core:2.9.5-SNAPSHOT") { exclude group: "com.google.code.gson", module: "gson" } compileOnly("org.projectlombok:lombok:1.18.36") annotationProcessor("org.projectlombok:lombok:1.18.36") - // Honestly it's not ideal to use an jar file directly, but eh this is convenient for me, and yes I know jitpack exist. + // Honestly it's not ideal to use an jar file directly, but eh this is convenient for me. implementation(files("libs/ouranos-1.0-all.jar")) implementation("com.fasterxml.jackson.core:jackson-annotations:2.17.0") implementation("com.fasterxml.jackson.core:jackson-annotations:2.17.0") diff --git a/libs/ouranos-1.0-all.jar b/libs/ouranos-1.0-all.jar index 04facc9..bf49f77 100644 Binary files a/libs/ouranos-1.0-all.jar and b/libs/ouranos-1.0-all.jar differ diff --git a/src/main/java/oxy/geyser/reversion/DuplicatedProtocolInfo.java b/src/main/java/oxy/geyser/reversion/DuplicatedProtocolInfo.java index c8637e0..f26dcf1 100644 --- a/src/main/java/oxy/geyser/reversion/DuplicatedProtocolInfo.java +++ b/src/main/java/oxy/geyser/reversion/DuplicatedProtocolInfo.java @@ -1,5 +1,6 @@ package oxy.geyser.reversion; +import com.github.blackjack200.ouranos.ProtocolInfo; import org.cloudburstmc.protocol.bedrock.codec.BedrockCodec; import org.cloudburstmc.protocol.bedrock.codec.BedrockCodecHelper; import org.cloudburstmc.protocol.bedrock.codec.v361.Bedrock_v361; @@ -51,6 +52,11 @@ import org.cloudburstmc.protocol.bedrock.codec.v819.Bedrock_v819; import org.cloudburstmc.protocol.bedrock.codec.v827.Bedrock_v827; import org.cloudburstmc.protocol.bedrock.codec.v844.Bedrock_v844; +import org.cloudburstmc.protocol.bedrock.codec.v859.Bedrock_v859; +import org.cloudburstmc.protocol.bedrock.codec.v860.Bedrock_v860; +import org.cloudburstmc.protocol.bedrock.codec.v898.Bedrock_v898; +import org.cloudburstmc.protocol.bedrock.codec.v924.Bedrock_v924; +import org.cloudburstmc.protocol.bedrock.codec.v944.Bedrock_v944; import org.cloudburstmc.protocol.bedrock.data.EncodingSettings; import java.util.Set; @@ -76,7 +82,14 @@ public static void addPacketCodec(BedrockCodec packetCodec) { } static { - // 1.21-1.21.111 + // 26.x + addPacketCodec(Bedrock_v944.CODEC); + addPacketCodec(Bedrock_v924.CODEC); + + // 1.21.x + addPacketCodec(Bedrock_v898.CODEC); + addPacketCodec(Bedrock_v860.CODEC); + addPacketCodec(Bedrock_v859.CODEC); addPacketCodec(Bedrock_v844.CODEC); addPacketCodec(Bedrock_v827.CODEC); addPacketCodec(Bedrock_v819.CODEC); diff --git a/src/main/java/oxy/geyser/reversion/GeyserReversion.java b/src/main/java/oxy/geyser/reversion/GeyserReversion.java index 019fd8c..34259c2 100644 --- a/src/main/java/oxy/geyser/reversion/GeyserReversion.java +++ b/src/main/java/oxy/geyser/reversion/GeyserReversion.java @@ -13,11 +13,13 @@ import net.lenni0451.reflect.Agents; import org.cloudburstmc.netty.channel.raknet.RakChannelFactory; import org.cloudburstmc.netty.channel.raknet.config.RakChannelOption; +import org.cloudburstmc.netty.channel.raknet.config.RakServerCookieMode; import org.cloudburstmc.netty.handler.codec.raknet.server.RakServerOfflineHandler; import org.cloudburstmc.netty.handler.codec.raknet.server.RakServerRateLimiter; import org.cloudburstmc.protocol.bedrock.codec.BedrockCodec; import org.cloudburstmc.protocol.bedrock.codec.v818.Bedrock_v818; import org.cloudburstmc.protocol.bedrock.codec.v844.Bedrock_v844; +import org.cloudburstmc.protocol.bedrock.codec.v944.Bedrock_v944; import org.geysermc.event.subscribe.Subscribe; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.api.event.lifecycle.GeyserPostInitializeEvent; @@ -50,7 +52,7 @@ public class GeyserReversion implements Extension { public static ExtensionLogger LOGGER; - public static BedrockCodec OLDEST_GEYSER_CODEC = CodecUtil.rebuildCodec(Bedrock_v844.CODEC); + public static BedrockCodec OLDEST_GEYSER_CODEC = CodecUtil.rebuildCodec(Bedrock_v944.CODEC); private static final TransportHelper.TransportType TRANSPORT = TransportHelper.TRANSPORT_TYPE; @@ -112,7 +114,7 @@ public void onGeyserPostInitializeEvent(GeyserPostInitializeEvent event) { .option(RakChannelOption.RAK_MAX_MTU, geyser.config().advanced().bedrock().mtu()) .option(RakChannelOption.RAK_PACKET_LIMIT, rakPacketLimit) .option(RakChannelOption.RAK_GLOBAL_PACKET_LIMIT, rakGlobalPacketLimit) - .option(RakChannelOption.RAK_SEND_COOKIE, rakSendCookie) + .option(RakChannelOption.RAK_SERVER_COOKIE_MODE, rakSendCookie ? RakServerCookieMode.ACTIVE : RakServerCookieMode.INVALID) .childHandler(serverInitializer); Bootstraps.setupBootstrap(bootstrap, TransportHelper.TRANSPORT_TYPE);