GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-19 14:59:27 +00:00
Code Issues Releases Activity

Merge branch 'master' into feature/1.21.11

Browse Source
This commit is contained in:
Aurora
2025-12-11 18:06:14 +00:00
parent 7b92716986 e4c11401db
commit 8b573ea6e8
4 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
View File

@@ -118,10 +118,6 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
private boolean setCorrectCodec(int protocolVersion) { private boolean setCorrectCodec(int protocolVersion) {
BedrockCodec packetCodec = GameProtocol.getBedrockCodec(protocolVersion); BedrockCodec packetCodec = GameProtocol.getBedrockCodec(protocolVersion);
// temp fix allowing 1.21.130 preview to join
if (protocolVersion == 897) {
packetCodec = GameProtocol.getBedrockCodec(898);
}
if (packetCodec == null) { if (packetCodec == null) {
// None of our Bedrock codecs support this client version, so we can simply compare it to our default protocol. // None of our Bedrock codecs support this client version, so we can simply compare it to our default protocol.
String supportedVersions = GameProtocol.getAllSupportedBedrockVersions(); String supportedVersions = GameProtocol.getAllSupportedBedrockVersions();

3
core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCommandsTranslator.java
View File

@@ -43,7 +43,6 @@ import org.geysermc.geyser.GeyserImpl;
import org.geysermc.geyser.api.event.java.ServerDefineCommandsEvent; import org.geysermc.geyser.api.event.java.ServerDefineCommandsEvent;
import org.geysermc.geyser.api.util.PlatformType; import org.geysermc.geyser.api.util.PlatformType;
import org.geysermc.geyser.command.CommandRegistry; import org.geysermc.geyser.command.CommandRegistry;
import org.geysermc.geyser.network.GameProtocol;
import org.geysermc.geyser.registry.BlockRegistries; import org.geysermc.geyser.registry.BlockRegistries;
import org.geysermc.geyser.registry.Registries; import org.geysermc.geyser.registry.Registries;
import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.session.GeyserSession;
@@ -124,7 +123,7 @@ public class JavaCommandsTranslator extends PacketTranslator<ClientboundCommands
@Override @Override
public void translate(GeyserSession session, ClientboundCommandsPacket packet) { public void translate(GeyserSession session, ClientboundCommandsPacket packet) {
// Don't send command suggestions if they are disabled // Don't send command suggestions if they are disabled
if (GameProtocol.is1_21_130orHigher(session.protocolVersion()) || !session.getGeyser().config().gameplay().commandSuggestions()) { if (!session.getGeyser().config().gameplay().commandSuggestions()) {
session.getGeyser().getLogger().debug("Not sending translated command suggestions as they are disabled."); session.getGeyser().getLogger().debug("Not sending translated command suggestions as they are disabled.");
// Send a mostly empty packet so Bedrock doesn't override /help with its own, built-in help command. // Send a mostly empty packet so Bedrock doesn't override /help with its own, built-in help command.

2
gradle.properties
View File

@@ -8,5 +8,5 @@ org.gradle.vfs.watch=false
group=org.geysermc group=org.geysermc
id=geyser id=geyser
version=2.9.1-SNAPSHOT version=2.9.2-SNAPSHOT
description=Allows for players from Minecraft: Bedrock Edition to join Minecraft: Java Edition servers. description=Allows for players from Minecraft: Bedrock Edition to join Minecraft: Java Edition servers.

6
gradle/libs.versions.toml
View File

@@ -13,9 +13,9 @@ guava = "29.0-jre"
gson = "2.3.1" # Provided by Spigot 1.8.8 TODO bump to 2.8.1 or similar (Spigot 1.16.5 version) after Merge gson = "2.3.1" # Provided by Spigot 1.8.8 TODO bump to 2.8.1 or similar (Spigot 1.16.5 version) after Merge
gson-runtime = "2.10.1" gson-runtime = "2.10.1"
websocket = "1.5.1" websocket = "1.5.1"
protocol-connection = "3.0.0.Beta11-20251209.183710-13" protocol-connection = "3.0.0.Beta11-20251210.195537-15"
protocol-common = "3.0.0.Beta11-20251209.183710-12" protocol-common = "3.0.0.Beta11-20251210.195537-14"
protocol-codec = "3.0.0.Beta11-20251209.183710-13" protocol-codec = "3.0.0.Beta11-20251210.195537-15"
raknet = "1.0.0.CR3-20251208.214317-23" raknet = "1.0.0.CR3-20251208.214317-23"
minecraftauth = "5.0.0" minecraftauth = "5.0.0"
mcprotocollib = "1.21.11-20251210.192611-9" mcprotocollib = "1.21.11-20251210.192611-9"