Feature: 26.1, API 2.10.0

.editorconfig

@@ -12,3 +12,7 @@ max_line_length = off
 ij_java_class_count_to_use_import_on_demand = 9999
 ij_java_doc_align_exception_comments = false
 ij_java_doc_align_param_comments = false
+
+[*.json]
+indent_size = 2
+tab_width = 2

.github/workflows/build-remote.yml

@@ -27,7 +27,7 @@ jobs:
         with:
           checkout_repository: ${{ inputs.repository }}
           checkout_ref: ${{ inputs.ref }}
-          setup-java_java-version: 21
+          setup-java_java-version: 25
           setup-gradle_cache-read-only: true
 
       - name: Build Geyser
@@ -44,4 +44,4 @@ jobs:
             bootstrap/spigot/build/libs/Geyser-Spigot.jar
             bootstrap/bungeecord/build/libs/Geyser-BungeeCord.jar
             bootstrap/velocity/build/libs/Geyser-Velocity.jar
-            bootstrap/viaproxy/build/libs/Geyser-ViaProxy.jar
+            bootstrap/viaproxy/build/libs/Geyser-ViaProxy.jar

.github/workflows/build.yml

@@ -34,7 +34,7 @@ jobs:
       - name: Setup Gradle
         uses: GeyserMC/actions/setup-gradle-composite@master
         with:
-          setup-java_java-version: 21
+          setup-java_java-version: 25
 
       - name: Build Geyser
         run: ./gradlew build

README.md

@@ -19,7 +19,7 @@ Special thanks to the DragonProxy project for being a trailblazer in protocol tr
 | Edition | Supported Versions                                                                                   |
 |---------|------------------------------------------------------------------------------------------------------|
 | Bedrock | 1.21.130 - 1.21.132, 26.0, 26.1, 26.2, 26.3, 26.10                                                   |
-| Java    | 1.21.11 (For older versions, [see this guide](https://geysermc.org/wiki/geyser/supported-versions/)) |
+| Java    | 26.1 (For older versions, [see this guide](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.

ap/src/main/java/org/geysermc/geyser/processor/BlockEntityProcessor.java

@@ -30,7 +30,7 @@
 import javax.lang.model.SourceVersion;
 
 @SupportedAnnotationTypes("*")
-@SupportedSourceVersion(SourceVersion.RELEASE_17)
+@SupportedSourceVersion(SourceVersion.RELEASE_21)
 public class BlockEntityProcessor extends ClassProcessor {
     public BlockEntityProcessor() {
         super("org.geysermc.geyser.translator.level.block.entity.BlockEntity");

ap/src/main/java/org/geysermc/geyser/processor/CollisionRemapperProcessor.java

@@ -30,7 +30,7 @@
 import javax.lang.model.SourceVersion;
 
 @SupportedAnnotationTypes("*")
-@SupportedSourceVersion(SourceVersion.RELEASE_17)
+@SupportedSourceVersion(SourceVersion.RELEASE_21)
 public class CollisionRemapperProcessor extends ClassProcessor {
     public CollisionRemapperProcessor() {
         super("org.geysermc.geyser.translator.collision.CollisionRemapper");

ap/src/main/java/org/geysermc/geyser/processor/PacketTranslatorProcessor.java

@@ -30,7 +30,7 @@
 import javax.lang.model.SourceVersion;
 
 @SupportedAnnotationTypes("*")
-@SupportedSourceVersion(SourceVersion.RELEASE_17)
+@SupportedSourceVersion(SourceVersion.RELEASE_21)
 public class PacketTranslatorProcessor extends ClassProcessor {
     public PacketTranslatorProcessor() {
         super("org.geysermc.geyser.translator.protocol.Translator");

ap/src/main/java/org/geysermc/geyser/processor/SoundHandlerProcessor.java

@@ -30,7 +30,7 @@
 import javax.lang.model.SourceVersion;
 
 @SupportedAnnotationTypes("*")
-@SupportedSourceVersion(SourceVersion.RELEASE_17)
+@SupportedSourceVersion(SourceVersion.RELEASE_21)
 public class SoundHandlerProcessor extends ClassProcessor {
     public SoundHandlerProcessor() {
         super("org.geysermc.geyser.translator.sound.SoundTranslator");

bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePingPassthrough.java

@@ -90,8 +90,8 @@ private static ListenerInfo getDefaultListener() {
     private ServerPing getPingInfo() {
         return new ServerPing(
                 new ServerPing.Protocol(
-                        proxyServer.getName() + " " + ProtocolConstants.SUPPORTED_VERSIONS.get(0) + "-" + ProtocolConstants.SUPPORTED_VERSIONS.get(ProtocolConstants.SUPPORTED_VERSIONS.size() - 1),
-                        ProtocolConstants.SUPPORTED_VERSION_IDS.get(ProtocolConstants.SUPPORTED_VERSION_IDS.size() - 1)),
+                        proxyServer.getName() + " " + ProtocolConstants.SUPPORTED_VERSIONS.getFirst() + "-" + ProtocolConstants.SUPPORTED_VERSIONS.getLast(),
+                        ProtocolConstants.SUPPORTED_VERSION_IDS.getLast()),
                 new ServerPing.Players(getDefaultListener().getMaxPlayers(), proxyServer.getOnlineCount(), null),
                 TextComponent.fromLegacyText(getDefaultListener().getMotd())[0],
                 proxyServer.getConfig().getFaviconObject()
@@ -115,7 +115,7 @@ public String getName() {
 
         @Override
         public int getVersion() {
-            return ProtocolConstants.SUPPORTED_VERSION_IDS.get(ProtocolConstants.SUPPORTED_VERSION_IDS.size() - 1);
+            return ProtocolConstants.SUPPORTED_VERSION_IDS.getLast();
         }
 
         @Override

bootstrap/mod/build.gradle.kts

@@ -6,13 +6,9 @@ architectury {
     common("neoforge", "fabric")
 }
 
-loom {
-    mixin.defaultRefmapName.set("geyser-refmap.json")
-}
-
 afterEvaluate {
     // We don't need these
-    tasks.named("remapModrinthJar").configure {
+    tasks.named("mergeShadowAndJarJar").configure {
         enabled = false
     }
 }

bootstrap/mod/fabric/build.gradle.kts

@@ -19,10 +19,10 @@ loom {
 }
 
 dependencies {
-    modImplementation(libs.fabric.loader)
-    modApi(libs.fabric.api)
+    implementation(libs.fabric.loader)
+    api(libs.fabric.api)
 
-    api(project(":mod", configuration = "namedElements"))
+    api(project(":mod"))
     shadowBundle(project(path = ":mod", configuration = "transformProductionFabric"))
     shadowBundle(projects.core)
     includeTransitive(projects.core)
@@ -47,7 +47,7 @@ dependencies {
     shadowBundle(projects.api)
     shadowBundle(projects.common)
 
-    modImplementation(libs.cloud.fabric)
+    implementation(libs.cloud.fabric)
     include(libs.cloud.fabric)
     include(libs.fabric.permissions.api)
 }
@@ -60,23 +60,48 @@ relocate("org.cloudburstmc.netty")
 relocate("org.cloudburstmc.protocol")
 relocate("org.spongepowered.configurate")
 
-tasks {
-    remapJar {
-        archiveBaseName.set("Geyser-Fabric")
+fabricApi {
+    configureTests {
+        createSourceSet = true
+        modId = "geyser-gametest"
+        enableClientGameTests = false
+        eula = true
     }
+}
 
-    remapModrinthJar {
-        archiveBaseName.set("geyser-fabric")
+tasks {
+    named<Jar>("mergeShadowAndJarJar") {
+        from (
+            zipTree( shadowJar.map { it.outputs.files.singleFile } ).matching {
+                exclude("fabric.mod.json")
+                exclude("LICENSE")
+            },
+            zipTree( jar.map { it.outputs.files.singleFile } ).matching {
+                include("META-INF/jars/**")
+                include("fabric.mod.json")
+                include("LICENSE")
+            }
+        )
+        archiveBaseName.set("Geyser-Fabric")
     }
 
-    shadowJar {
-        mergeServiceFiles()
+    getByName("processGametestResources", ProcessResources::class) {
+        filesMatching("fabric.mod.json") {
+            expand(
+                "id" to "geyser",
+                "name" to "Geyser",
+                "version" to project.version,
+                "description" to project.description!!,
+                "url" to "https://geysermc.org",
+                "author" to "GeyserMC"
+            )
+        }
     }
 }
 
 modrinth {
     loaders.add("fabric")
-    uploadFile.set(tasks.getByPath("remapModrinthJar"))
+    uploadFile.set(tasks.getByName("renameModrinthJar"))
     dependencies {
         required.project("fabric-api")
     }

bootstrap/mod/fabric/gradle.properties

@@ -1 +1 @@
-loom.platform=fabric
+loom.platform=fabric

bootstrap/mod/fabric/src/gametest/java/org/geysermc/geyser/gametest/GeyserComponentHashTestInstance.java

@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2025 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.geyser.gametest;
+
+import com.google.common.hash.HashCode;
+import com.mojang.datafixers.util.Either;
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.DataResult;
+import com.mojang.serialization.DynamicOps;
+import com.mojang.serialization.JavaOps;
+import com.mojang.serialization.MapCodec;
+import com.mojang.serialization.MapLike;
+import com.mojang.serialization.RecordBuilder;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import io.netty.buffer.Unpooled;
+import net.minecraft.core.component.DataComponentType;
+import net.minecraft.core.component.TypedDataComponent;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.gametest.framework.GameTestAssertException;
+import net.minecraft.gametest.framework.GameTestEnvironments;
+import net.minecraft.gametest.framework.GameTestHelper;
+import net.minecraft.gametest.framework.GameTestInstance;
+import net.minecraft.gametest.framework.TestData;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.resources.Identifier;
+import net.minecraft.resources.RegistryOps;
+import net.minecraft.util.ExtraCodecs;
+import net.minecraft.util.HashOps;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.gametest.registries.GameTestJavaRegistryProvider;
+import org.geysermc.geyser.item.hashing.DataComponentHashers;
+import org.geysermc.geyser.item.hashing.MapHasher;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftTypes;
+import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponent;
+import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponentTypes;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+
+public class GeyserComponentHashTestInstance extends GameTestInstance {
+
+    private static final MapCodec<List<TypedDataComponent<?>>> TYPED_COMPONENT_LIST_CODEC = DataComponentType.PERSISTENT_CODEC
+        .dispatchMap("component", list -> list.getFirst().type(), GeyserComponentHashTestInstance::typedComponentListCodec);
+    private static final MapCodec<List<TypedDataComponent<?>>> MERGED_TYPED_COMPONENT_LIST_CODEC = TYPED_COMPONENT_LIST_CODEC.codec().listOf()
+        .xmap(listOfLists -> listOfLists.stream().flatMap(List::stream).toList(), list -> {
+            Map<DataComponentType<?>, List<TypedDataComponent<?>>> split = new HashMap<>();
+            list.forEach(component -> {
+                split.compute(component.type(), (type, typeList) -> {
+                    if (typeList == null) {
+                        typeList = new ArrayList<>();
+                    }
+                    typeList.add(component);
+                    return typeList;
+                });
+            });
+            return split.values().stream().toList();
+        }).fieldOf("components");
+    private static final MapCodec<List<TypedDataComponent<?>>> MERGED_AND_SINGLE_COMPONENT_MAP_CODEC = Codec.mapEither(MERGED_TYPED_COMPONENT_LIST_CODEC, TYPED_COMPONENT_LIST_CODEC)
+        .xmap(Either::unwrap, Either::left);
+    // Cursed codec to extract a RegistryOps
+    private static final MapCodec<RegistryOps<?>> REGISTRY_OPS_MAP_CODEC = new MapCodec<>() {
+        @Override
+        public <T> Stream<T> keys(DynamicOps<T> ops) {
+            return Stream.empty();
+        }
+
+        @Override
+        public <T> DataResult<RegistryOps<?>> decode(DynamicOps<T> ops, MapLike<T> input) {
+            if (ops instanceof RegistryOps<T> registryOps) {
+                return DataResult.success(registryOps);
+            }
+            return DataResult.error(() -> "Registry ops required for parsing");
+        }
+
+        @Override
+        public <T> RecordBuilder<T> encode(RegistryOps<?> input, DynamicOps<T> ops, RecordBuilder<T> prefix) {
+            // noop
+            return prefix;
+        }
+    };
+    public static final MapCodec<GeyserComponentHashTestInstance> MAP_CODEC = RecordCodecBuilder.mapCodec(instance ->
+        instance.group(
+            REGISTRY_OPS_MAP_CODEC.forGetter(ignored -> null),
+            MERGED_AND_SINGLE_COMPONENT_MAP_CODEC.forGetter(testInstance -> testInstance.testCases),
+            Codec.BOOL.optionalFieldOf("required", true).forGetter(GameTestInstance::required)
+        ).apply(instance, GeyserComponentHashTestInstance::new)
+    );
+
+    private final List<TypedDataComponent<?>> testCases;
+
+    public GeyserComponentHashTestInstance(RegistryOps<?> ops, List<TypedDataComponent<?>> testCases, boolean required) {
+        super(new TestData<>(ops.getter(Registries.TEST_ENVIRONMENT)
+            .flatMap(getter -> getter.get(GameTestEnvironments.DEFAULT_KEY)).orElseThrow(),
+            Identifier.withDefaultNamespace("empty"), 1, 1, required));
+        this.testCases = testCases;
+    }
+
+    @Override
+    public void run(@NotNull GameTestHelper helper) {
+        RegistryOps<Object> javaOps = helper.getLevel().registryAccess().createSerializationContext(JavaOps.INSTANCE);
+        RegistryOps<HashCode> hashOps = helper.getLevel().registryAccess().createSerializationContext(HashOps.CRC32C_INSTANCE);
+
+        for (TypedDataComponent<?> testCase : testCases) {
+            // Encode vanilla component to buffer
+            RegistryFriendlyByteBuf buffer = new RegistryFriendlyByteBuf(Unpooled.buffer(), helper.getLevel().registryAccess());
+            TypedDataComponent.STREAM_CODEC.encode(buffer, testCase);
+
+            // Read with MCPL
+            int id = MinecraftTypes.readVarInt(buffer);
+            DataComponent<?, ?> mcplComponent = DataComponentTypes.from(id).readDataComponent(buffer);
+
+            Object encodedJavaValue = testCase.encodeValue(javaOps).getOrThrow();
+            // Hash both and compare
+            int expected = testCase.encodeValue(hashOps).getOrThrow().asInt();
+            GameTestJavaRegistryProvider registries = new GameTestJavaRegistryProvider(helper.getLevel().registryAccess());
+            int geyser = DataComponentHashers.hash(registries, mcplComponent).asInt();
+
+            try {
+                helper.assertValueEqual(expected, geyser, "hash for component " + encodedJavaValue);
+            } catch (GameTestAssertException assertException) {
+                GeyserImpl.getInstance().getLogger().info("Hash failed for component " + testCase.type() + " (" + testCase.value() + "), printing values of MapHasher");
+                MapHasher.debug = true;
+                DataComponentHashers.hash(registries, mcplComponent);
+                MapHasher.debug = false;
+                GeyserImpl.getInstance().getLogger().info("The Mojang encoded/expected value is printed in the exception message");
+                throw assertException;
+            }
+        }
+
+        // Succeed if nothing was thrown
+        helper.succeed();
+    }
+
+    @Override
+    public @NotNull MapCodec<GeyserComponentHashTestInstance> codec() {
+        return MAP_CODEC;
+    }
+
+    @Override
+    protected @NotNull MutableComponent typeDescription() {
+        // TODO more descriptive?
+        return Component.literal("Geyser Data Component Hash Test");
+    }
+
+    // Generics are NOT friendly!!!
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    private static MapCodec<List<TypedDataComponent<?>>> typedComponentListCodec(DataComponentType component) {
+        return ExtraCodecs.compactListCodec(component.codecOrThrow(), ExtraCodecs.nonEmptyList(component.codecOrThrow().listOf()))
+            .fieldOf("value")
+            .xmap(
+                values -> ((List<?>) values).stream()
+                    .map(testCase -> new TypedDataComponent(component, testCase))
+                    .map(testCase -> (TypedDataComponent<?>) testCase)
+                    .toList(),
+                typedComponents -> ((List<?>) typedComponents).stream()
+                    .map(testCase -> ((TypedDataComponent<?>) testCase).value())
+                    .toList());
+    }
+}