Skip to content

Update protocol for 1.21.93 support and update mappings for the Lava Chicken music disc #5651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
onebeastchris merged 2 commits into from
Jul 6, 2025
Merged

Update protocol for 1.21.93 support and update mappings for the Lava Chicken music disc #5651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3543194
Update protocol for 1.21.93 support
eclipseisoffline Jul 5, 2025
535c026
Target latest mappings
eclipseisoffline Jul 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/src/main/java/org/geysermc/geyser/network/GameProtocol.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.cloudburstmc.protocol.bedrock.codec.v786.Bedrock_v786;
import org.cloudburstmc.protocol.bedrock.codec.v800.Bedrock_v800;
import org.cloudburstmc.protocol.bedrock.codec.v818.Bedrock_v818;
import org.cloudburstmc.protocol.bedrock.codec.v819.Bedrock_v819;
import org.cloudburstmc.protocol.bedrock.netty.codec.packet.BedrockPacketCodec;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodec;
Expand All @@ -48,9 +49,8 @@ public final class GameProtocol {
* Default Bedrock codec that should act as a fallback. Should represent the latest available
* release of the game that Geyser supports.
*/
public static final BedrockCodec DEFAULT_BEDROCK_CODEC = CodecProcessor.processCodec(Bedrock_v818.CODEC.toBuilder()
public static final BedrockCodec DEFAULT_BEDROCK_CODEC = CodecProcessor.processCodec(Bedrock_v819.CODEC.toBuilder()
.minecraftVersion("1.21.93")
.protocolVersion(819) // we love unannounced proto bumps
.build());

/**
Expand Down
11 changes: 3 additions & 8 deletions core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import org.cloudburstmc.protocol.bedrock.codec.v786.Bedrock_v786;
import org.cloudburstmc.protocol.bedrock.codec.v800.Bedrock_v800;
import org.cloudburstmc.protocol.bedrock.codec.v818.Bedrock_v818;
import org.cloudburstmc.protocol.bedrock.codec.v819.Bedrock_v819;
import org.cloudburstmc.protocol.bedrock.data.definitions.BlockDefinition;
import org.cloudburstmc.protocol.bedrock.data.definitions.ItemDefinition;
import org.cloudburstmc.protocol.bedrock.data.definitions.SimpleItemDefinition;
Expand Down Expand Up @@ -141,17 +142,11 @@ public static void populate() {
fallbacks1_21_80.put(Items.MUSIC_DISC_LAVA_CHICKEN, Items.MUSIC_DISC_CHIRP);
fallbacks1_21_80.put(Items.MUSIC_DISC_TEARS, Items.MUSIC_DISC_5);

List<PaletteVersion> paletteVersions = new ArrayList<>(3);
List<PaletteVersion> paletteVersions = new ArrayList<>(4);
paletteVersions.add(new PaletteVersion("1_21_70", Bedrock_v786.CODEC.getProtocolVersion(), itemFallbacks));
paletteVersions.add(new PaletteVersion("1_21_80", Bedrock_v800.CODEC.getProtocolVersion(), fallbacks1_21_80));
paletteVersions.add(new PaletteVersion("1_21_90", Bedrock_v818.CODEC.getProtocolVersion(), Map.of(Items.MUSIC_DISC_LAVA_CHICKEN, Items.MUSIC_DISC_CHIRP)));
paletteVersions.add(new PaletteVersion("1_21_93", 819, Map.of(), (item, mapping) -> {
// FIXME do this in mappings
if (item == Items.MUSIC_DISC_LAVA_CHICKEN) {
return new GeyserMappingItem().withBedrockIdentifier("minecraft:music_disc_lava_chicken");
}
return mapping;
}));
paletteVersions.add(new PaletteVersion("1_21_93", Bedrock_v819.CODEC.getProtocolVersion()));

GeyserBootstrap bootstrap = GeyserImpl.getInstance().getBootstrap();

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/mappings
Open in desktop
Submodule mappings updated 2 files
+1 −1 items.json
+4 −1 sounds.json
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ netty = "4.2.1.Final"
guava = "29.0-jre"
gson = "2.3.1" # Provided by Spigot 1.8.8
websocket = "1.5.1"
protocol-connection = "3.0.0.Beta7-20250619.102015-10"
protocol-common = "3.0.0.Beta7-20250619.102015-10"
protocol-codec = "3.0.0.Beta7-20250619.102015-10"
protocol-connection = "3.0.0.Beta7-20250705.103024-11"
protocol-common = "3.0.0.Beta7-20250705.103024-11"
protocol-codec = "3.0.0.Beta7-20250705.103024-11"
raknet = "1.0.0.CR3-20250218.160705-18"
minecraftauth = "4.1.1"
mcprotocollib = "1.21.7-20250630.183005-1"
Expand Down