Update to support latest Geyser.

Author: oryxel1

build.gradle

@@ -14,7 +14,7 @@ repositories {
 
 
 dependencies {
-    compileOnly("org.geysermc.geyser:core:2.9.0-SNAPSHOT") {
+    compileOnly("org.geysermc.geyser:core:2.9.2-SNAPSHOT") {
         exclude group: "com.google.code.gson", module: "gson"
     }
     compileOnly("org.projectlombok:lombok:1.18.36")

src/main/java/oxy/geyser/reversion/GeyserReversion.java

@@ -17,6 +17,7 @@
 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.geysermc.event.subscribe.Subscribe;
 import org.geysermc.geyser.GeyserImpl;
 import org.geysermc.geyser.api.event.lifecycle.GeyserPostInitializeEvent;
@@ -49,7 +50,7 @@
 public class GeyserReversion implements Extension {
     public static ExtensionLogger LOGGER;
 
-    public static BedrockCodec OLDEST_GEYSER_CODEC = CodecUtil.rebuildCodec(Bedrock_v818.CODEC);
+    public static BedrockCodec OLDEST_GEYSER_CODEC = CodecUtil.rebuildCodec(Bedrock_v844.CODEC);
 
     private static final TransportHelper.TransportType TRANSPORT = TransportHelper.TRANSPORT_TYPE;
 
@@ -71,12 +72,12 @@ public void onGeyserPreInitializeEvent(GeyserPreInitializeEvent event) {
             throw new RuntimeException("CODE INJECTION FAILED! ANY VERSION BELOW " + Bedrock_v575.CODEC.getMinecraftVersion() + " WILL NOT BE SUPPORTED!", e);
         }
 
-        try {
-            Class.forName("org.geysermc.geyser.configuration.GeyserConfig");
-        } catch (ClassNotFoundException ignored) {
-            event.extensionManager().disable(this);
-            throw new RuntimeException("YOUR GEYSER VERSION IS OUTDATED AND NO LONGER SUPPORTED, PLEASE UPDATE!");
-        }
+//        try {
+//            Class.forName("org.geysermc.geyser.configuration.GeyserConfig");
+//        } catch (ClassNotFoundException ignored) {
+//            event.extensionManager().disable(this);
+//            throw new RuntimeException("YOUR GEYSER VERSION IS OUTDATED AND NO LONGER SUPPORTED, PLEASE UPDATE!");
+//        }
     }
 
     // Fucking hell.

src/main/java/oxy/geyser/reversion/handler/TranslatorPacketHandler.java

@@ -203,6 +203,8 @@ public boolean onMicrosoftLoginComplete(PendingBedrockAuthentication.Authenticat
             geyser.getSessionManager().addPendingSession(this.session);
             geyser.eventBus().fire(new SessionInitializeEvent(this.session));
 
+            session.sendMessage("Authenticating in the server as " + token.getDisplayName());
+
             this.user.setAuthenticated(true);
             this.session.authenticate(session.getAuthData().name());
             return true;

src/main/java/oxy/geyser/reversion/handler/duplicated/UpstreamPacketHandler.java

@@ -30,7 +30,6 @@
 import org.cloudburstmc.protocol.bedrock.BedrockDisconnectReasons;
 import org.cloudburstmc.protocol.bedrock.codec.BedrockCodec;
 import org.cloudburstmc.protocol.bedrock.codec.compat.BedrockCompat;
-import org.cloudburstmc.protocol.bedrock.data.ExperimentData;
 import org.cloudburstmc.protocol.bedrock.data.PacketCompressionAlgorithm;
 import org.cloudburstmc.protocol.bedrock.data.ResourcePackType;
 import org.cloudburstmc.protocol.bedrock.netty.codec.compression.CompressionStrategy;
@@ -237,14 +236,17 @@ public PacketSignal handle(LoginPacket loginPacket) {
             // Can happen if an error occurs in the resource pack event; that'll disconnect the player
             return PacketSignal.HANDLED;
         }
+        session.integratedPackActive(resourcePackLoadEvent.isIntegratedPackActive());
 
         ResourcePacksInfoPacket resourcePacksInfo = new ResourcePacksInfoPacket();
         resourcePacksInfo.getResourcePackInfos().addAll(this.resourcePackLoadEvent.infoPacketEntries());
         resourcePacksInfo.setVibrantVisualsForceDisabled(!session.isAllowVibrantVisuals());
 
-        resourcePacksInfo.setForcedToAccept(GeyserImpl.getInstance().config().gameplay().forceResourcePacks());
+        resourcePacksInfo.setForcedToAccept(GeyserImpl.getInstance().config().gameplay().forceResourcePacks() ||
+                resourcePackLoadEvent.isIntegratedPackActive());
         resourcePacksInfo.setWorldTemplateId(UUID.randomUUID());
         resourcePacksInfo.setWorldTemplateVersion("*");
+
         session.sendUpstreamPacket(resourcePacksInfo);
 
         GeyserLocale.loadGeyserLocale(session.locale());
@@ -271,7 +273,8 @@ public PacketSignal handle(ResourcePackClientResponsePacket packet) {
                     // We must spawn the white world
                     session.connect();
                 }
-                geyser.getLogger().info(GeyserLocale.getLocaleStringLog("geyser.network.connect", session.getAuthData().name()));
+                geyser.getLogger().info(GeyserLocale.getLocaleStringLog("geyser.network.connect", session.getAuthData().name() +
+                        " (" + session.protocolVersion() + ")"));
             }
             case SEND_PACKS -> {
                 if (packet.getPackIds().isEmpty()) {
@@ -290,13 +293,9 @@ public PacketSignal handle(ResourcePackClientResponsePacket packet) {
                 stackPacket.setGameVersion(session.getClientData().getGameVersion());
                 stackPacket.getResourcePacks().addAll(this.resourcePackLoadEvent.orderedPacks());
 
-                if (GameProtocol.is1_21_100(session)) {
-                    // Support copper age drop features (or some of them) in 1.21.100
-                    stackPacket.getExperiments().add(new ExperimentData("y_2025_drop_3", true));
-                }
-
                 session.sendUpstreamPacket(stackPacket);
             }
+            case REFUSED -> session.disconnect("disconnectionScreen.resourcePack");
             default -> {
                 GeyserImpl.getInstance().getLogger().debug("received unknown status packet: " + packet);
                 session.disconnect("disconnectionScreen.resourcePack");
@@ -380,7 +379,7 @@ public void processNextChunk() {
         ResourcePackHolder holder = this.resourcePackLoadEvent.getPacks().get(packet.getPackId());
         if (holder == null) {
             GeyserImpl.getInstance().getLogger().debug("Client {0} tried to request pack id {1} not sent to it!",
-                session.bedrockUsername(), packet.getPackId());
+                    session.bedrockUsername(), packet.getPackId());
             chunkRequestQueue.clear();
             session.disconnect("disconnectionScreen.resourcePack");
             return;
@@ -426,7 +425,7 @@ public void processNextChunk() {
             // Also flushes packets
             // Avoids bursting slower / delayed clients
             session.sendUpstreamPacketImmediately(data);
-            GeyserImpl.getInstance().getScheduledThread().schedule(this::processNextChunk, PACKET_SEND_DELAY, TimeUnit.MILLISECONDS);
+            session.scheduleInEventLoop(this::processNextChunk, PACKET_SEND_DELAY, TimeUnit.MILLISECONDS);
         } else {
             session.sendUpstreamPacket(data);
         }
@@ -437,13 +436,13 @@ public void processNextChunk() {
         }
     }
 
-    protected void sendPackDataInfo(String id) {
+    private void sendPackDataInfo(String id) {
         ResourcePackDataInfoPacket data = new ResourcePackDataInfoPacket();
         String[] packID = id.split("_");
 
         if (packID.length < 2) {
             GeyserImpl.getInstance().getLogger().debug("Client {0} tried to request invalid pack id {1}!",
-                session.bedrockUsername(), packID);
+                    session.bedrockUsername(), packID);
             session.disconnect("disconnectionScreen.resourcePack");
             return;
         }
@@ -453,15 +452,15 @@ protected void sendPackDataInfo(String id) {
             packId = UUID.fromString(packID[0]);
         } catch (IllegalArgumentException e) {
             GeyserImpl.getInstance().getLogger().debug("Client {0} tried to request pack with an invalid id {1})",
-                session.bedrockUsername(), id);
+                    session.bedrockUsername(), id);
             session.disconnect("disconnectionScreen.resourcePack");
             return;
         }
 
         ResourcePackHolder holder = this.resourcePackLoadEvent.getPacks().get(packId);
         if (holder == null) {
             GeyserImpl.getInstance().getLogger().debug("Client {0} tried to request pack id {1} not sent to it!",
-                session.bedrockUsername(), id);
+                    session.bedrockUsername(), id);
             session.disconnect("disconnectionScreen.resourcePack");
             return;
         }

src/main/resources/extension.yml

@@ -1,6 +1,6 @@
 id: geyser-reversion
 name: GeyserReversion
 main: oxy.geyser.reversion.GeyserReversion
-api: 2.9.0
+api: 2.9.2
 version: 1.0.0
 authors: [oryxel]