Feature: 26.1, API 2.10.0

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.

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,15 +61,12 @@ relocate("org.cloudburstmc.protocol")
 relocate("org.spongepowered.configurate")
 
 tasks {
-    remapJar {
-        archiveBaseName.set("Geyser-Fabric")
-    }
-
     remapModrinthJar {
         archiveBaseName.set("geyser-fabric")
     }
 
     shadowJar {
+        archiveBaseName.set("Geyser-Fabric")
         mergeServiceFiles()
     }
 }

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,15 +62,12 @@ tasks.withType<Jar> {
 }
 
 tasks {
-    remapJar {
-        archiveBaseName.set("Geyser-NeoForge")
-    }
-
     remapModrinthJar {
         archiveBaseName.set("geyser-neoforge")
     }
 
     shadowJar {
+        archiveBaseName.set("Geyser-NeoForge")
         mergeServiceFiles()
     }
 }

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/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;
         }

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

@@ -6,7 +6,7 @@ import org.gradle.kotlin.dsl.dependencies
 plugins {
     id("geyser.platform-conventions")
     id("architectury-plugin")
-    id("dev.architectury.loom")
+    id("dev.architectury.loom-no-remap")
 }
 
 // These are provided by Minecraft/modded platforms already, no need to include them
@@ -49,7 +49,7 @@ loom {
 
 indra {
     javaVersions {
-        target(21)
+        target(25)
     }
 }
 
@@ -75,15 +75,8 @@ tasks {
         // Mirrors the example fabric project, otherwise tons of dependencies are shaded that shouldn't be
         configurations = listOf(project.configurations.getByName("shadowBundle"))
         // The remapped shadowJar is the final desired mod jar
-        archiveVersion.set(project.version.toString())
-        archiveClassifier.set("shaded")
-    }
-
-    remapJar {
-        dependsOn(shadowJar)
-        inputFile.set(shadowJar.get().archiveFile)
-        archiveClassifier.set("")
         archiveVersion.set("")
+        archiveClassifier.set("")
     }
 
     register("remapModrinthJar", RemapJarTask::class) {
@@ -115,5 +108,4 @@ afterEvaluate {
 
 dependencies {
     minecraft(libs.minecraft)
-    mappings(loom.officialMojangMappings())
 }

build.gradle.kts

@@ -6,6 +6,6 @@ plugins {
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(21)
+        languageVersion = JavaLanguageVersion.of(25)
     }
 }

core/src/main/java/org/geysermc/geyser/command/defaults/StatisticsCommand.java

@@ -46,7 +46,7 @@ public void execute(CommandContext<GeyserCommandSource> context) {
         GeyserSession session = Objects.requireNonNull(context.sender().connection());
 
         session.setWaitingForStatistics(true);
-        ServerboundClientCommandPacket packet = new ServerboundClientCommandPacket(ClientCommand.STATS);
+        ServerboundClientCommandPacket packet = new ServerboundClientCommandPacket(ClientCommand.REQUEST_STATS);
         session.sendDownstreamGamePacket(packet);
     }
 }

core/src/main/java/org/geysermc/geyser/entity/type/ThrowableEggEntity.java

@@ -58,12 +58,14 @@ public void setItem(EntityMetadata<ItemStack, ?> entityMetadata) {
     }
 
     private static TemperatureVariantAnimal.BuiltInVariant getVariantOrFallback(GeyserSession session, GeyserItemStack stack) {
-        Holder<Key> holder = stack.getComponent(DataComponentTypes.CHICKEN_VARIANT);
-        if (holder != null) {
-            Key chickenVariant = holder.getOrCompute(id -> JavaRegistries.CHICKEN_VARIANT.key(session, id));
-            for (var variant : TemperatureVariantAnimal.BuiltInVariant.values()) {
-                if (chickenVariant.asMinimalString().equalsIgnoreCase(variant.name())) {
-                    return variant;
+        Integer id = stack.getComponent(DataComponentTypes.CHICKEN_VARIANT);
+        if (id != null) {
+            Key chickenVariant = JavaRegistries.CHICKEN_VARIANT.key(session, id);
+            if (chickenVariant != null) {
+                for (var variant : TemperatureVariantAnimal.BuiltInVariant.values()) {
+                    if (chickenVariant.asMinimalString().equalsIgnoreCase(variant.name())) {
+                        return variant;
+                    }
                 }
             }
         }

core/src/main/java/org/geysermc/geyser/entity/type/living/AgeableEntity.java

@@ -62,7 +62,7 @@ protected float getAdultSize() {
      * The scale that should be used when this entity is a baby.
      */
     protected float getBabySize() {
-        return 0.55f;
+        return 0.5f;
     }
 
     public boolean isBaby() {

core/src/main/java/org/geysermc/geyser/entity/type/living/DolphinEntity.java

@@ -43,6 +43,11 @@ public boolean canBeLeashed() {
         return true;
     }
 
+    @Override
+    protected float getBabySize() {
+        return 0.65f;
+    }
+
     @NonNull
     @Override
     protected InteractiveTag testMobInteraction(@NonNull Hand hand, @NonNull GeyserItemStack itemInHand) {

core/src/main/java/org/geysermc/geyser/entity/type/living/animal/ArmadilloEntity.java

@@ -80,6 +80,11 @@ public void onPeeking() {
         }
     }
 
+    @Override
+    protected float getBabySize() {
+        return 0.6f;
+    }
+
     @Override
     @Nullable
     protected Tag<Item> getFoodTag() {

core/src/main/java/org/geysermc/geyser/inventory/item/GeyserInstrument.java

@@ -35,7 +35,8 @@
 import org.geysermc.geyser.translator.text.MessageTranslator;
 import org.geysermc.geyser.util.MinecraftKey;
 import org.geysermc.geyser.util.SoundUtils;
-import org.geysermc.mcprotocollib.protocol.data.game.item.component.InstrumentComponent;
+import org.geysermc.mcprotocollib.protocol.data.game.Holder;
+import org.geysermc.mcprotocollib.protocol.data.game.item.component.Instrument;
 import org.geysermc.mcprotocollib.protocol.data.game.level.sound.BuiltinSound;
 
 import java.util.Locale;
@@ -90,20 +91,16 @@ static int bedrockIdToJava(GeyserSession session, int id) {
     }
 
     // TODO test in 1.21.5
-    static GeyserInstrument fromComponent(GeyserSession session, InstrumentComponent component) {
-        if (component.instrumentLocation() != null) {
-            return session.getRegistryCache().registry(JavaRegistries.INSTRUMENT).byKey(component.instrumentLocation());
-        } else if (component.instrumentHolder() != null) {
-            if (component.instrumentHolder().isId()) {
-                return session.getRegistryCache().registry(JavaRegistries.INSTRUMENT).byId(component.instrumentHolder().id());
-            }
-            InstrumentComponent.Instrument custom = component.instrumentHolder().custom();
-            return new Wrapper(custom, session.locale());
+    static GeyserInstrument fromComponent(GeyserSession session, Holder<Instrument> component) {
+        if (component.isCustom()) {
+            return new Wrapper(component.custom(), session.locale());
+        } else if (component.isId()) {
+            return session.getRegistryCache().registry(JavaRegistries.INSTRUMENT).byId(component.id());
         }
-        throw new IllegalStateException("InstrumentComponent must have either a location or a holder");
+        throw new IllegalStateException("Instrument must either be custom or have an id");
     }
 
-    record Wrapper(InstrumentComponent.Instrument instrument, String locale) implements GeyserInstrument {
+    record Wrapper(Instrument instrument, String locale) implements GeyserInstrument {
         @Override
         public String soundEvent() {
             return instrument.soundEvent().getName();

core/src/main/java/org/geysermc/geyser/inventory/recipe/TrimRecipe.java

@@ -40,7 +40,6 @@
 import org.geysermc.mcprotocollib.protocol.data.game.Holder;
 import org.geysermc.mcprotocollib.protocol.data.game.item.component.ArmorTrim;
 import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponentTypes;
-import org.geysermc.mcprotocollib.protocol.data.game.item.component.ProvidesTrimMaterial;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -49,7 +48,7 @@
  * Stores information on trim materials and patterns, including smithing armor hacks for pre-1.20.
  */
 public final class TrimRecipe {
-    private static final Map<ProvidesTrimMaterial, Item> trimMaterialProviders = new HashMap<>();
+    private static final Map<Holder<ArmorTrim.TrimMaterial>, Item> trimMaterialProviders = new HashMap<>();
 
     // For CraftingDataPacket
     public static final String ID = "minecraft:smithing_armor_trim";
@@ -69,9 +68,8 @@ public static TrimMaterial readTrimMaterial(RegistryEntryContext context) {
         int networkId = context.getNetworkId(context.id());
         ItemMapping trimItem = null;
         if (context.session().isPresent()) {
-            for (ProvidesTrimMaterial provider : materialProviders().keySet()) {
-                Holder<ArmorTrim.TrimMaterial> materialHolder = provider.materialHolder();
-                if (context.id().equals(provider.materialLocation()) || (materialHolder != null && materialHolder.isId() && materialHolder.id() == networkId)) {
+            for (Holder<ArmorTrim.TrimMaterial> provider : materialProviders().keySet()) {
+                if ((provider.isCustom() && context.id().asString().equals(provider.custom().assetBase())) || (provider.isId() && provider.id() == networkId)) {
                     trimItem = context.session().get().getItemMappings().getMapping(materialProviders().get(provider));
                     break;
                 }
@@ -110,10 +108,10 @@ private TrimRecipe() {
     }
 
     // Lazy initialise
-    private static Map<ProvidesTrimMaterial, Item> materialProviders() {
+    private static Map<Holder<ArmorTrim.TrimMaterial>, Item> materialProviders() {
         if (trimMaterialProviders.isEmpty()) {
             for (Item item : Registries.JAVA_ITEMS.get()) {
-                ProvidesTrimMaterial provider = item.getComponent(null, DataComponentTypes.PROVIDES_TRIM_MATERIAL);
+                Holder<ArmorTrim.TrimMaterial> provider = item.getComponent(null, DataComponentTypes.PROVIDES_TRIM_MATERIAL);
                 if (provider != null) {
                     trimMaterialProviders.put(provider, item);
                 }

core/src/main/java/org/geysermc/geyser/item/Items.java

@@ -296,6 +296,7 @@ public final class Items {
     public static final Item RED_WOOL = register(new BlockItem(builder(), Blocks.RED_WOOL));
     public static final Item BLACK_WOOL = register(new BlockItem(builder(), Blocks.BLACK_WOOL));
     public static final Item DANDELION = register(new BlockItem(builder(), Blocks.DANDELION));
+    public static final Item GOLDEN_DANDELION = register(new BlockItem(builder(), Blocks.GOLDEN_DANDELION));
     public static final Item OPEN_EYEBLOSSOM = register(new BlockItem(builder(), Blocks.OPEN_EYEBLOSSOM));
     public static final Item CLOSED_EYEBLOSSOM = register(new BlockItem(builder(), Blocks.CLOSED_EYEBLOSSOM));
     public static final Item POPPY = register(new BlockItem(builder(), Blocks.POPPY));
@@ -1193,7 +1194,7 @@ public final class Items {
     public static final Item BLAZE_POWDER = register(new Item("blaze_powder", builder()));
     public static final Item MAGMA_CREAM = register(new Item("magma_cream", builder()));
     public static final Item BREWING_STAND = register(new BlockItem(builder(), Blocks.BREWING_STAND));
-    public static final Item CAULDRON = register(new BlockItem(builder(), Blocks.CAULDRON, Blocks.LAVA_CAULDRON, Blocks.POWDER_SNOW_CAULDRON, Blocks.WATER_CAULDRON));
+    public static final Item CAULDRON = register(new BlockItem(builder(), Blocks.CAULDRON, Blocks.POWDER_SNOW_CAULDRON, Blocks.WATER_CAULDRON, Blocks.LAVA_CAULDRON));
     public static final Item ENDER_EYE = register(new Item("ender_eye", builder()));
     public static final Item GLISTERING_MELON_SLICE = register(new Item("glistering_melon_slice", builder()));
     public static final Item CHICKEN_SPAWN_EGG = register(new SpawnEggItem("chicken_spawn_egg", builder()));