Merge branch 'master' of https://github.com/GeyserMC/Geyser into feat…

…ure/configurate

README.md

@@ -15,7 +15,7 @@ The ultimate goal of this project is to allow Minecraft: Bedrock Edition users t
 Special thanks to the DragonProxy project for being a trailblazer in protocol translation and for all the team members who have joined us here!
 
 ## Supported Versions
-Geyser is currently supporting Minecraft Bedrock 1.20.80 - 1.21.30 and Minecraft Java 1.21/1.21.1. For more information, please see [here](https://geysermc.org/wiki/geyser/supported-versions/).
+Geyser is currently supporting Minecraft Bedrock 1.20.80 - 1.21.44 and Minecraft Java 1.21.2/1.21.3. For more information, please see [here](https://geysermc.org/wiki/geyser/supported-versions/).
 
 ## Setting Up
 Take a look [here](https://geysermc.org/wiki/geyser/setup/) for how to set up Geyser.

api/src/main/java/org/geysermc/geyser/api/connection/GeyserConnection.java

@@ -70,6 +70,11 @@ public interface GeyserConnection extends Connection, CommandSource {
      */
     void closeForm();
 
+    /**
+     * Gets the Bedrock protocol version of the player.
+     */
+    int protocolVersion();
+
     /**
      * @param javaId the Java entity ID to look up.
      * @return a {@link GeyserEntity} if present in this connection's entity tracker.

bootstrap/mod/fabric/src/main/java/org/geysermc/geyser/platform/fabric/GeyserFabricBootstrap.java

@@ -32,7 +32,7 @@
 import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.server.level.ServerPlayer;
 import org.geysermc.geyser.GeyserImpl;
 import org.geysermc.geyser.command.CommandRegistry;
 import org.geysermc.geyser.command.CommandSourceConverter;
@@ -80,7 +80,7 @@ public void onInitialize() {
         var sourceConverter = CommandSourceConverter.layered(
                 CommandSourceStack.class,
                 id -> getServer().getPlayerList().getPlayer(id),
-                Player::createCommandSourceStack,
+                ServerPlayer::createCommandSourceStack,
                 () -> getServer().createCommandSourceStack(), // NPE if method reference is used, since server is not available yet
                 ModCommandSource::new
         );

bootstrap/mod/fabric/src/main/resources/fabric.mod.json

@@ -23,8 +23,8 @@
     "geyser.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.15.11",
+    "fabricloader": ">=0.16.7",
     "fabric": "*",
-    "minecraft": ">=1.21"
+    "minecraft": ">=1.21.2"
   }
 }

bootstrap/mod/neoforge/build.gradle.kts

@@ -13,6 +13,9 @@ architectury {
 provided("org.cloudburstmc.math", "api")
 provided("com.google.errorprone", "error_prone_annotations")
 
+// Jackson shipped by Minecraft is too old, so we shade & relocate our newer version
+relocate("com.fasterxml.jackson")
+
 val includeTransitive: Configuration = configurations.getByName("includeTransitive")
 
 dependencies {
@@ -31,6 +34,12 @@ dependencies {
     }
     shadow(projects.core) { isTransitive = false }
 
+    // Minecraft (1.21.2+) includes jackson. But an old version!
+    shadow(libs.jackson.core) { isTransitive = false }
+    shadow(libs.jackson.databind) { isTransitive = false }
+    shadow(libs.jackson.dataformat.yaml) { isTransitive = false }
+    shadow(libs.jackson.annotations) { isTransitive = false }
+
     // Let's shade in our own api
     shadow(projects.api) { isTransitive = false }
 
@@ -56,6 +65,11 @@ tasks {
     remapModrinthJar {
         archiveBaseName.set("geyser-neoforge")
     }
+
+    shadowJar {
+        // Without this, jackson's service files are not relocated
+        mergeServiceFiles()
+    }
 }
 
 modrinth {

bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/GeyserNeoForgeBootstrap.java

@@ -26,7 +26,7 @@
 package org.geysermc.geyser.platform.neoforge;
 
 import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.server.level.ServerPlayer;
 import net.neoforged.bus.api.EventPriority;
 import net.neoforged.fml.ModContainer;
 import net.neoforged.fml.common.Mod;
@@ -72,7 +72,7 @@ public GeyserNeoForgeBootstrap(ModContainer container) {
         var sourceConverter = CommandSourceConverter.layered(
                 CommandSourceStack.class,
                 id -> getServer().getPlayerList().getPlayer(id),
-                Player::createCommandSourceStack,
+                ServerPlayer::createCommandSourceStack,
                 () -> getServer().createCommandSourceStack(),
                 ModCommandSource::new
         );
@@ -104,7 +104,9 @@ private void onClientStopping(GameShuttingDownEvent ignored) {
     }
 
     private void onPlayerJoin(PlayerEvent.PlayerLoggedInEvent event) {
-        GeyserModUpdateListener.onPlayReady(event.getEntity());
+        if (event.getEntity() instanceof ServerPlayer player) {
+            GeyserModUpdateListener.onPlayReady(player);
+        }
     }
 
     @Override

bootstrap/mod/src/main/java/org/geysermc/geyser/platform/mod/GeyserModCompressionDisabler.java

@@ -28,8 +28,8 @@
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelOutboundHandlerAdapter;
 import io.netty.channel.ChannelPromise;
-import net.minecraft.network.protocol.login.ClientboundGameProfilePacket;
 import net.minecraft.network.protocol.login.ClientboundLoginCompressionPacket;
+import net.minecraft.network.protocol.login.ClientboundLoginFinishedPacket;
 
 /**
  * Disables the compression packet (and the compression handlers from being added to the pipeline) for Geyser clients
@@ -45,7 +45,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
         Class<?> msgClass = msg.getClass();
         // Don't let any compression packet get through
         if (!ClientboundLoginCompressionPacket.class.isAssignableFrom(msgClass)) {
-            if (ClientboundGameProfilePacket.class.isAssignableFrom(msgClass)) {
+            if (ClientboundLoginFinishedPacket.class.isAssignableFrom(msgClass)) {
 
                 // We're past the point that a compression packet can be sent, so we can safely yeet ourselves away
                 ctx.channel().pipeline().remove(this);

bootstrap/mod/src/main/java/org/geysermc/geyser/platform/mod/GeyserModUpdateListener.java

@@ -25,13 +25,13 @@
 
 package org.geysermc.geyser.platform.mod;
 
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.server.level.ServerPlayer;
 import org.geysermc.geyser.Permissions;
 import org.geysermc.geyser.platform.mod.command.ModCommandSource;
 import org.geysermc.geyser.util.VersionCheckUtils;
 
 public final class GeyserModUpdateListener {
-    public static void onPlayReady(Player player) {
+    public static void onPlayReady(ServerPlayer player) {
         // Should be creating this in the supplier, but we need it for the permission check.
         // Not a big deal currently because ModCommandSource doesn't load locale, so don't need to try to wait for it.
         ModCommandSource source = new ModCommandSource(player.createCommandSourceStack());

bootstrap/mod/src/main/java/org/geysermc/geyser/platform/mod/world/GeyserModWorldManager.java

@@ -33,8 +33,10 @@
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerChunkCache;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BannerBlockEntity;
@@ -43,7 +45,6 @@
 import net.minecraft.world.level.block.entity.DecoratedPotBlockEntity;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.LevelChunkSection;
-import net.minecraft.world.level.chunk.status.ChunkStatus;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.cloudburstmc.math.vector.Vector3i;
 import org.geysermc.geyser.level.GeyserWorldManager;
@@ -84,16 +85,17 @@ public int getBlockAt(GeyserSession session, int x, int y, int z) {
         }
 
         Level level = player.level();
-        if (y < level.getMinBuildHeight()) {
+        if (y < level.getMinY()) {
             return 0;
         }
 
-        ChunkAccess chunk = level.getChunkSource().getChunk(x >> 4, z >> 4, ChunkStatus.FULL, false);
+        // Only loads active chunks, and doesn't delegate to main thread
+        ChunkAccess chunk = ((ServerChunkCache) level.getChunkSource()).chunkMap.getChunkToSend(ChunkPos.asLong(x >> 4, z >> 4));
         if (chunk == null) {
             return 0;
         }
 
-        int worldOffset = level.getMinBuildHeight() >> 4;
+        int worldOffset = level.getMinY() >> 4;
         int chunkOffset = (y >> 4) - worldOffset;
         if (chunkOffset < chunk.getSections().length) {
             LevelChunkSection section = chunk.getSections()[chunkOffset];

bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneLogger.java

@@ -34,10 +34,24 @@
 import org.geysermc.geyser.GeyserLogger;
 import org.geysermc.geyser.command.GeyserCommandSource;
 import org.geysermc.geyser.text.ChatColor;
+import org.jline.reader.Candidate;
+import org.jline.reader.LineReader;
+import org.jline.reader.LineReaderBuilder;
 
 @Slf4j
 public class GeyserStandaloneLogger extends SimpleTerminalConsole implements GeyserLogger, GeyserCommandSource {
 
+    @Override
+    protected LineReader buildReader(LineReaderBuilder builder) {
+        builder.completer((reader, line, candidates) -> {
+            var suggestions = GeyserImpl.getInstance().commandRegistry().suggestionsFor(this, line.line());
+            for (var suggestion : suggestions.list()) {
+                candidates.add(new Candidate(suggestion.suggestion()));
+            }
+        });
+        return super.buildReader(builder);
+    }
+
     @Override
     protected boolean isRunning() {
         return !GeyserImpl.getInstance().isShuttingDown();

bootstrap/standalone/src/main/resources/log4j2.xml

@@ -20,6 +20,9 @@
             <AppenderRef ref="TerminalConsole"/>
             <AppenderRef ref="Console"/>
             <AppenderRef ref="File"/>
+            <filters>
+                <MarkerFilter marker="packet_logging" onMatch="DENY" onMismatch="ACCEPT" />
+            </filters>
         </Root>
     </Loggers>
-</Configuration>
+</Configuration>

bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPingPassthrough.java

@@ -31,8 +31,10 @@
 import com.velocitypowered.api.proxy.InboundConnection;
 import com.velocitypowered.api.proxy.ProxyServer;
 import com.velocitypowered.api.proxy.server.ServerPing;
+import com.velocitypowered.api.proxy.server.ServerPing.Version;
 import lombok.AllArgsConstructor;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+import org.geysermc.geyser.network.GameProtocol;
 import org.geysermc.geyser.ping.GeyserPingInfo;
 import org.geysermc.geyser.ping.IGeyserPingPassthrough;
 
@@ -51,7 +53,9 @@ public GeyserPingInfo getPingInformation(InetSocketAddress inetSocketAddress) {
         try {
             event = server.getEventManager().fire(new ProxyPingEvent(new GeyserInboundConnection(inetSocketAddress), ServerPing.builder()
                     .description(server.getConfiguration().getMotd()).onlinePlayers(server.getPlayerCount())
-                    .maximumPlayers(server.getConfiguration().getShowMaxPlayers()).build())).get();
+                    .maximumPlayers(server.getConfiguration().getShowMaxPlayers())
+                    .version(new Version(GameProtocol.getJavaProtocolVersion(), GameProtocol.getJavaMinecraftVersion())) 
+                    .build())).get();
         } catch (ExecutionException | InterruptedException e) {
             throw new RuntimeException(e);
         }

build-logic/src/main/kotlin/geyser.modrinth-uploading-conventions.gradle.kts

@@ -7,12 +7,13 @@ tasks.modrinth.get().dependsOn(tasks.modrinthSyncBody)
 
 modrinth {
     token.set(System.getenv("MODRINTH_TOKEN") ?: "") // Even though this is the default value, apparently this prevents GitHub Actions caching the token?
+    debugMode.set(System.getenv("MODRINTH_TOKEN") == null)
     projectId.set("geyser")
     versionName.set(versionName(project))
     versionNumber.set(projectVersion(project))
     versionType.set("beta")
     changelog.set(System.getenv("CHANGELOG") ?: "")
-    gameVersions.addAll("1.21", libs.minecraft.get().version as String)
+    gameVersions.addAll("1.21.2", libs.minecraft.get().version as String)
     failSilently.set(true)
 
     syncBodyFrom.set(rootProject.file("README.md").readText())

core/build.gradle.kts

@@ -70,6 +70,7 @@ dependencies {
     // Test
     testImplementation(libs.junit)
     testImplementation(libs.gson.runtime) // Record support
+    testImplementation(libs.mockito)
 
     // Annotation Processors
     compileOnly(projects.ap)

core/src/main/java/org/geysermc/geyser/GeyserImpl.java

@@ -79,6 +79,7 @@
 import org.geysermc.geyser.event.GeyserEventBus;
 import org.geysermc.geyser.extension.GeyserExtensionManager;
 import org.geysermc.geyser.impl.MinecraftVersionImpl;
+import org.geysermc.geyser.level.BedrockDimension;
 import org.geysermc.geyser.level.WorldManager;
 import org.geysermc.geyser.network.GameProtocol;
 import org.geysermc.geyser.network.netty.GeyserServer;
@@ -97,7 +98,6 @@
 import org.geysermc.geyser.text.MinecraftLocale;
 import org.geysermc.geyser.translator.text.MessageTranslator;
 import org.geysermc.geyser.util.AssetUtils;
-import org.geysermc.geyser.util.DimensionUtils;
 import org.geysermc.geyser.util.JsonUtils;
 import org.geysermc.geyser.util.MinecraftAuthLogger;
 import org.geysermc.geyser.util.NewsHandler;
@@ -229,9 +229,14 @@ public void initialize() {
         }
         logger.info("******************************************");
 
-        /* Initialize registries */
-        Registries.init();
-        BlockRegistries.init();
+        /*
+        First load the registries and then populate them.
+        Both the block registries and the common registries depend on each other,
+        so maintaining this order is crucial for Geyser to load.
+         */
+        Registries.load();
+        BlockRegistries.populate();
+        Registries.populate();
 
         RegistryCache.init();
 
@@ -424,7 +429,7 @@ private void startInstance() {
             logger.debug("Epoll is not available; Erosion's Unix socket handling will not work.");
         }
 
-        DimensionUtils.changeBedrockNetherId(config.aboveBedrockNetherBuilding()); // Apply End dimension ID workaround to Nether
+        BedrockDimension.changeBedrockNetherId(config.aboveBedrockNetherBuilding()); // Apply End dimension ID workaround to Nether
 
         Integer bedrockThreadCount = Integer.getInteger("Geyser.BedrockNetworkThreads");
         if (bedrockThreadCount == null) {
@@ -747,7 +752,9 @@ public void disable() {
         runIfNonNull(newsHandler, NewsHandler::shutdown);
         runIfNonNull(erosionUnixListener, UnixSocketClientListener::close);
 
-        Registries.RESOURCE_PACKS.get().clear();
+        if (Registries.RESOURCE_PACKS.loaded()) {
+            Registries.RESOURCE_PACKS.get().clear();
+        }
 
         this.setEnabled(false);
     }