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/GameTestUtil.java

@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2026 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.mojang.serialization.DataResult;
+import com.mojang.serialization.DynamicOps;
+import com.mojang.serialization.MapCodec;
+import com.mojang.serialization.MapLike;
+import com.mojang.serialization.RecordBuilder;
+import net.minecraft.core.Holder;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.gametest.framework.GameTestEnvironments;
+import net.minecraft.gametest.framework.TestData;
+import net.minecraft.gametest.framework.TestEnvironmentDefinition;
+import net.minecraft.resources.Identifier;
+import net.minecraft.resources.RegistryOps;
+
+import java.util.stream.Stream;
+
+public class GameTestUtil {
+    // Cursed codec to extract a RegistryOps
+    public 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 TestData<Holder<TestEnvironmentDefinition<?>>> createEmptyTestData(RegistryOps<?> ops, boolean required) {
+        return new TestData<>(ops.getter(Registries.TEST_ENVIRONMENT)
+            .flatMap(getter -> getter.get(GameTestEnvironments.DEFAULT_KEY)).orElseThrow(),
+            Identifier.withDefaultNamespace("empty"), 1, 1, required);
+    }
+}

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

@@ -0,0 +1,36 @@
+/*
+ * 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 net.fabricmc.api.ModInitializer;
+
+public class GeyserGameTestBootstrap implements ModInitializer {
+
+    @Override
+    public void onInitialize() {
+        GeyserGameTests.bootstrap();
+    }
+}

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

@@ -0,0 +1,50 @@
+/*
+ * 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.mojang.serialization.MapCodec;
+import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.gametest.framework.GameTestInstance;
+import net.minecraft.resources.Identifier;
+import org.geysermc.geyser.gametest.tests.ComponentHashTestInstance;
+import org.geysermc.geyser.gametest.tests.RequiredComponentsForHashingTestInstance;
+
+public class GeyserGameTests {
+
+    private static Identifier createKey(String name) {
+        return Identifier.fromNamespaceAndPath("geyser", name);
+    }
+
+    private static void register(String name, MapCodec<? extends GameTestInstance> codec) {
+        Registry.register(BuiltInRegistries.TEST_INSTANCE_TYPE, createKey(name), codec);
+    }
+
+    public static void bootstrap() {
+        register("component_hash", ComponentHashTestInstance.MAP_CODEC);
+        register("required_components_for_hashing", RequiredComponentsForHashingTestInstance.MAP_CODEC);
+    }
+}

bootstrap/mod/fabric/src/gametest/java/org/geysermc/geyser/gametest/package-info.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2026 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
+ */
+@NullMarked
+package org.geysermc.geyser.gametest;
+
+import org.jspecify.annotations.NullMarked;