Skip to content

Added support for latest Gayser. #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oryxel1 merged 1 commit into from
Mar 28, 2026
Merged

Added support for latest Gayser. #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Binary file modified libs/ouranos-1.0-all.jar
View file
Open in desktop
Binary file not shown.
15 changes: 14 additions & 1 deletion src/main/java/oxy/geyser/reversion/DuplicatedProtocolInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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);
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/oxy/geyser/reversion/GeyserReversion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down
Loading