Feature: 26.1, API 2.10.0

.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)
 }
@@ -61,22 +61,25 @@ relocate("org.cloudburstmc.protocol")
 relocate("org.spongepowered.configurate")
 
 tasks {
-    remapJar {
+    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")
     }
-
-    remapModrinthJar {
-        archiveBaseName.set("geyser-fabric")
-    }
-
-    shadowJar {
-        mergeServiceFiles()
-    }
 }
 
 modrinth {
     loaders.add("fabric")
-    uploadFile.set(tasks.getByPath("remapModrinthJar"))
+    uploadFile.set(tasks.getByName("renameModrinthJar"))
     dependencies {
         required.project("fabric-api")
     }

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

@@ -25,6 +25,6 @@
   "depends": {
     "fabricloader": ">=0.18.2",
     "fabric-api": "*",
-    "minecraft": ">=1.21.11"
+    "minecraft": "~26.1"
   }
 }

bootstrap/mod/neoforge/build.gradle.kts

@@ -33,7 +33,7 @@ dependencies {
 
     neoForge(libs.neoforge.minecraft)
 
-    api(project(":mod", configuration = "namedElements"))
+    api(project(":mod"))
     shadowBundle(project(path = ":mod", configuration = "transformProductionNeoForge"))
     shadowBundle(projects.core)
 
@@ -51,7 +51,7 @@ dependencies {
     // Include all transitive deps of core via JiJ
     includeTransitive(projects.core)
 
-    modImplementation(libs.cloud.neoforge)
+    implementation(libs.cloud.neoforge)
     include(libs.cloud.neoforge)
 }
 
@@ -62,20 +62,22 @@ tasks.withType<Jar> {
 }
 
 tasks {
-    remapJar {
+    named<Jar>("mergeShadowAndJarJar") {
+        from (
+            zipTree( shadowJar.map { it.outputs.files.singleFile } ).matching {
+                exclude("LICENSE")
+            },
+            zipTree( jar.map { it.outputs.files.singleFile } ).matching {
+                include("META-INF/jars/**")
+                include("META-INF/jarjar/**")
+                include("LICENSE")
+            }
+        )
         archiveBaseName.set("Geyser-NeoForge")
     }
-
-    remapModrinthJar {
-        archiveBaseName.set("geyser-neoforge")
-    }
-
-    shadowJar {
-        mergeServiceFiles()
-    }
 }
 
 modrinth {
     loaders.add("neoforge")
-    uploadFile.set(tasks.getByPath("remapModrinthJar"))
+    uploadFile.set(tasks.getByName("renameModrinthJar"))
 }

bootstrap/mod/neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -16,12 +16,12 @@ config = "geyser_neoforge.mixins.json"
 [[dependencies.geyser_neoforge]]
     modId="neoforge"
     type="required"
-    versionRange="[21.11.0-beta,)"
+    versionRange="[26.1.0.1-beta,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.geyser_neoforge]]
     modId="minecraft"
     type="required"
-    versionRange="[1.21.11,)"
+    versionRange="[26.1,)"
     ordering="NONE"
     side="BOTH"

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

@@ -43,6 +43,7 @@
 import org.geysermc.geyser.GeyserLogger;
 import org.geysermc.geyser.ping.GeyserPingInfo;
 import org.geysermc.geyser.ping.IGeyserPingPassthrough;
+import org.jspecify.annotations.NonNull;
 
 import java.net.InetSocketAddress;
 import java.util.Objects;
@@ -94,9 +95,9 @@ private static class StatusInterceptor extends Connection {
         }
 
         @Override
-        public void send(Packet<?> packet, @Nullable ChannelFutureListener channelFutureListener, boolean bl) {
-            if (packet instanceof ClientboundStatusResponsePacket statusResponse) {
-                status = statusResponse.status();
+        public void send(@NonNull Packet<?> packet, @Nullable ChannelFutureListener channelFutureListener, boolean bl) {
+            if (packet instanceof ClientboundStatusResponsePacket(ServerStatus serverStatus)) {
+                status = serverStatus;
             }
             super.send(packet, channelFutureListener, bl);
         }

bootstrap/mod/src/main/java/org/geysermc/geyser/platform/mod/command/ModCommandSource.java

@@ -58,7 +58,7 @@ public String name() {
     @Override
     public void sendMessage(@NonNull String message) {
         if (source.getEntity() instanceof ServerPlayer) {
-            ((ServerPlayer) source.getEntity()).displayClientMessage(Component.literal(message), false);
+            ((ServerPlayer) source.getEntity()).sendSystemMessage(Component.literal(message), false);
         } else {
             GeyserImpl.getInstance().getLogger().info(ChatColor.toANSI(message + ChatColor.RESET));
         }
@@ -68,7 +68,7 @@ public void sendMessage(@NonNull String message) {
     public void sendMessage(net.kyori.adventure.text.Component message) {
         if (source.getEntity() instanceof ServerPlayer player) {
             JsonElement jsonComponent = GsonComponentSerializer.gson().serializeToTree(message);
-            player.displayClientMessage(ComponentSerialization.CODEC.parse(RegistryOps.create(JsonOps.INSTANCE, player.registryAccess()), jsonComponent).getOrThrow(), false);
+            player.sendSystemMessage(ComponentSerialization.CODEC.parse(RegistryOps.create(JsonOps.INSTANCE, player.registryAccess()), jsonComponent).getOrThrow(), false);
             return;
         }
         GeyserCommandSource.super.sendMessage(message);

bootstrap/mod/src/main/java/org/geysermc/geyser/platform/mod/mixin/client/IntegratedServerMixin.java

@@ -61,8 +61,8 @@ private void onOpenToLan(GameType gameType, boolean cheatsAllowed, int port, Cal
             GeyserLocale.loadGeyserLocale(this.minecraft.options.languageCode);
             // Give indication that Geyser is loaded
             Objects.requireNonNull(this.minecraft.player);
-            this.minecraft.player.displayClientMessage(Component.literal(GeyserLocale.getPlayerLocaleString("geyser.core.start.ip_suppressed",
-                    this.minecraft.options.languageCode, String.valueOf(GeyserImpl.getInstance().bedrockListener().port()))), false);
+            this.minecraft.player.sendSystemMessage(Component.literal(GeyserLocale.getPlayerLocaleString("geyser.core.start.ip_suppressed",
+                    this.minecraft.options.languageCode, String.valueOf(GeyserImpl.getInstance().bedrockListener().port()))));
         }
     }
 

bootstrap/mod/src/main/java/org/geysermc/geyser/platform/mod/mixin/server/DedicatedServerMixin.java

@@ -32,17 +32,19 @@
 import net.minecraft.server.dedicated.DedicatedServer;
 import net.minecraft.server.level.progress.LevelLoadListener;
 import net.minecraft.server.packs.repository.PackRepository;
+import net.minecraft.world.level.gamerules.GameRules;
 import net.minecraft.world.level.storage.LevelStorageSource;
 import org.geysermc.geyser.platform.mod.GeyserServerPortGetter;
 import org.spongepowered.asm.mixin.Mixin;
 
 import java.net.Proxy;
+import java.util.Optional;
 
 @Mixin(DedicatedServer.class)
 public abstract class DedicatedServerMixin extends MinecraftServer implements GeyserServerPortGetter {
 
-    public DedicatedServerMixin(Thread thread, LevelStorageSource.LevelStorageAccess levelStorageAccess, PackRepository packRepository, WorldStem worldStem, Proxy proxy, DataFixer dataFixer, Services services, LevelLoadListener levelLoadListener) {
-        super(thread, levelStorageAccess, packRepository, worldStem, proxy, dataFixer, services, levelLoadListener);
+    public DedicatedServerMixin(Thread thread, LevelStorageSource.LevelStorageAccess levelStorageAccess, PackRepository packRepository, WorldStem worldStem, Optional<GameRules> gameRules, Proxy proxy, DataFixer dataFixer, Services services, LevelLoadListener levelLoadListener) {
+        super(thread, levelStorageAccess, packRepository, worldStem, gameRules, proxy, dataFixer, services, levelLoadListener, true);
     }
 
     @Override

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

@@ -75,7 +75,7 @@ public int getBlockAt(GeyserSession session, int x, int y, int z) {
         }
 
         // Only loads active chunks, and doesn't delegate to main thread
-        ChunkAccess chunk = ((ServerChunkCache) level.getChunkSource()).chunkMap.getChunkToSend(ChunkPos.asLong(x >> 4, z >> 4));
+        ChunkAccess chunk = ((ServerChunkCache) level.getChunkSource()).chunkMap.getChunkToSend(ChunkPos.pack(x >> 4, z >> 4));
         if (chunk == null) {
             return 0;
         }

bootstrap/spigot/build.gradle.kts

@@ -80,7 +80,8 @@ modrinth {
     uploadFile.set(tasks.getByPath("shadowJar"))
     gameVersions.addAll("1.16.5", "1.17", "1.17.1", "1.18", "1.18.1", "1.18.2", "1.19",
         "1.19.1", "1.19.2", "1.19.3", "1.19.4", "1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6",
-        "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8")
+        "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10",
+        "1.21.11")
     loaders.addAll("spigot", "paper")
 }
 

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

@@ -17,7 +17,7 @@ indra {
     mitLicense()
 
     javaVersions {
-        target(17)
+        target(21)
     }
 }