Revert "Revert "Drop support for versions less than 1.19.80 (#3758)""

This reverts commit d93f3dd1f5.
2024-11-20 06:50:09 +01:00 · 2023-05-11 12:38:49 -04:00 · 2023-05-11 12:38:49 -04:00 · 8849fd7018
Commit 8849fd7018
--- a/core/src/main/java/org/geysermc/geyser/network/GameProtocol.java
+++ b/core/src/main/java/org/geysermc/geyser/network/GameProtocol.java
@ -28,14 +28,8 @@ package org.geysermc.geyser.network;
 import com.github.steveice10.mc.protocol.codec.MinecraftCodec;
 import com.github.steveice10.mc.protocol.codec.PacketCodec;
 import org.cloudburstmc.protocol.bedrock.codec.BedrockCodec;
-import org.cloudburstmc.protocol.bedrock.codec.v557.Bedrock_v557;
-import org.cloudburstmc.protocol.bedrock.codec.v560.Bedrock_v560;
-import org.cloudburstmc.protocol.bedrock.codec.v567.Bedrock_v567;
-import org.cloudburstmc.protocol.bedrock.codec.v568.Bedrock_v568;
-import org.cloudburstmc.protocol.bedrock.codec.v575.Bedrock_v575;
 import org.cloudburstmc.protocol.bedrock.codec.v582.Bedrock_v582;
 import org.cloudburstmc.protocol.bedrock.netty.codec.packet.BedrockPacketCodec;
-import org.geysermc.geyser.session.GeyserSession;

 import java.util.ArrayList;
 import java.util.List;
@ -64,17 +58,6 @@ public final class GameProtocol {
    private static final PacketCodec DEFAULT_JAVA_CODEC = MinecraftCodec.CODEC;

    static {
-        SUPPORTED_BEDROCK_CODECS.add(Bedrock_v557.CODEC.toBuilder()
-                .minecraftVersion("1.19.40/1.19.41")
-                .build());
-        SUPPORTED_BEDROCK_CODECS.add(Bedrock_v560.CODEC.toBuilder()
-                .minecraftVersion("1.19.50/1.19.51")
-                .build());
-        SUPPORTED_BEDROCK_CODECS.add(Bedrock_v567.CODEC);
-        SUPPORTED_BEDROCK_CODECS.add(Bedrock_v568.CODEC);
-        SUPPORTED_BEDROCK_CODECS.add(Bedrock_v575.CODEC.toBuilder()
-                .minecraftVersion("1.19.70/1.19.71/1.19.73")
-                .build());
        SUPPORTED_BEDROCK_CODECS.add(DEFAULT_BEDROCK_CODEC.toBuilder()
                .minecraftVersion("1.19.80/1.19.81")
                .build());
@ -94,20 +77,6 @@ public final class GameProtocol {
        return null;
    }

-    /* Bedrock convenience methods to gatekeep features and easily remove the check on version removal */
-
-    public static boolean supports1_19_50(GeyserSession session) {
-        return session.getUpstream().getProtocolVersion() >= Bedrock_v560.CODEC.getProtocolVersion();
-    }
-
-    public static boolean supports1_19_60(GeyserSession session) {
-        return session.getUpstream().getProtocolVersion() >= Bedrock_v567.CODEC.getProtocolVersion();
-    }
-
-    public static boolean supports1_19_80(GeyserSession session) {
-        return session.getUpstream().getProtocolVersion() >= Bedrock_v582.CODEC.getProtocolVersion();
-    }
-
    /**
     * Gets the {@link PacketCodec} for Minecraft: Java Edition.
     *
--- a/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
+++ b/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
@ -28,8 +28,6 @@ package org.geysermc.geyser.network;
 import io.netty.buffer.Unpooled;
 import org.cloudburstmc.protocol.bedrock.BedrockDisconnectReasons;
 import org.cloudburstmc.protocol.bedrock.codec.BedrockCodec;
-import org.cloudburstmc.protocol.bedrock.codec.v567.Bedrock_v567;
-import org.cloudburstmc.protocol.bedrock.codec.v568.Bedrock_v568;
 import org.cloudburstmc.protocol.bedrock.data.ExperimentData;
 import org.cloudburstmc.protocol.bedrock.data.PacketCompressionAlgorithm;
 import org.cloudburstmc.protocol.bedrock.data.ResourcePackType;
@ -173,11 +171,6 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
            return PacketSignal.HANDLED;
        }

-        // Hack for... whatever this is
-        if (loginPacket.getProtocolVersion() == Bedrock_v567.CODEC.getProtocolVersion() && !session.getClientData().getGameVersion().equals("1.19.60")) {
-            session.getUpstream().getSession().setCodec(Bedrock_v568.CODEC);
-        }
-
        PlayStatusPacket playStatus = new PlayStatusPacket();
        playStatus.setStatus(PlayStatusPacket.Status.LOGIN_SUCCESS);
        session.sendUpstreamPacket(playStatus);
--- a/core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java
@ -32,10 +32,6 @@ import com.google.common.collect.Interner;
 import com.google.common.collect.Interners;
 import it.unimi.dsi.fastutil.objects.*;
 import org.cloudburstmc.nbt.*;
-import org.cloudburstmc.protocol.bedrock.codec.v544.Bedrock_v544;
-import org.cloudburstmc.protocol.bedrock.codec.v560.Bedrock_v560;
-import org.cloudburstmc.protocol.bedrock.codec.v567.Bedrock_v567;
-import org.cloudburstmc.protocol.bedrock.codec.v575.Bedrock_v575;
 import org.cloudburstmc.protocol.bedrock.codec.v582.Bedrock_v582;
 import org.cloudburstmc.protocol.bedrock.data.defintions.BlockDefinition;
 import org.geysermc.geyser.GeyserImpl;
@ -82,10 +78,6 @@ public final class BlockRegistryPopulator {
        };
        BiFunction<String, NbtMapBuilder, String> emptyMapper = (bedrockIdentifier, statesBuilder) -> null;
        ImmutableMap<ObjectIntPair<String>, BiFunction<String, NbtMapBuilder, String>> blockMappers = ImmutableMap.<ObjectIntPair<String>, BiFunction<String, NbtMapBuilder, String>>builder()
-                .put(ObjectIntPair.of("1_19_20", Bedrock_v544.CODEC.getProtocolVersion()), emptyMapper)
-                .put(ObjectIntPair.of("1_19_50", Bedrock_v560.CODEC.getProtocolVersion()), emptyMapper)
-                .put(ObjectIntPair.of("1_19_60", Bedrock_v567.CODEC.getProtocolVersion()), emptyMapper)
-                .put(ObjectIntPair.of("1_19_70", Bedrock_v575.CODEC.getProtocolVersion()), woolMapper)
                .put(ObjectIntPair.of("1_19_80", Bedrock_v582.CODEC.getProtocolVersion()), (bedrockIdentifier, statesBuilder) -> {
                    String identifier = woolMapper.apply(bedrockIdentifier, statesBuilder);
                    if (identifier != null) {
--- a/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java
@ -37,10 +37,6 @@ import it.unimi.dsi.fastutil.objects.*;
 import org.cloudburstmc.nbt.NbtMap;
 import org.cloudburstmc.nbt.NbtMapBuilder;
 import org.cloudburstmc.nbt.NbtType;
-import org.cloudburstmc.protocol.bedrock.codec.v544.Bedrock_v544;
-import org.cloudburstmc.protocol.bedrock.codec.v560.Bedrock_v560;
-import org.cloudburstmc.protocol.bedrock.codec.v567.Bedrock_v567;
-import org.cloudburstmc.protocol.bedrock.codec.v575.Bedrock_v575;
 import org.cloudburstmc.protocol.bedrock.codec.v582.Bedrock_v582;
 import org.cloudburstmc.protocol.bedrock.data.defintions.BlockDefinition;
 import org.cloudburstmc.protocol.bedrock.data.defintions.ItemDefinition;
@ -74,17 +70,7 @@ public class ItemRegistryPopulator {
    }

    public static void populate() {
-        Map<Item, String> manualFallback = new HashMap<>();
-        manualFallback.put(Items.ENDER_DRAGON_SPAWN_EGG, "minecraft:enderman_spawn_egg");
-        manualFallback.put(Items.WITHER_SPAWN_EGG, "minecraft:wither_skeleton_spawn_egg");
-        manualFallback.put(Items.SNOW_GOLEM_SPAWN_EGG, "minecraft:polar_bear_spawn_egg");
-        manualFallback.put(Items.IRON_GOLEM_SPAWN_EGG, "minecraft:villager_spawn_egg");
-
        Map<String, PaletteVersion> paletteVersions = new Object2ObjectOpenHashMap<>();
-        paletteVersions.put("1_19_20", new PaletteVersion(Bedrock_v544.CODEC.getProtocolVersion(), manualFallback));
-        paletteVersions.put("1_19_50", new PaletteVersion(Bedrock_v560.CODEC.getProtocolVersion(), manualFallback));
-        paletteVersions.put("1_19_60", new PaletteVersion(Bedrock_v567.CODEC.getProtocolVersion(), Collections.emptyMap()));
-        paletteVersions.put("1_19_70", new PaletteVersion(Bedrock_v575.CODEC.getProtocolVersion(), Collections.emptyMap()));
        paletteVersions.put("1_19_80", new PaletteVersion(Bedrock_v582.CODEC.getProtocolVersion(), Collections.emptyMap()));

        GeyserBootstrap bootstrap = GeyserImpl.getInstance().getBootstrap();
@ -182,11 +168,6 @@ public class ItemRegistryPopulator {
            Set<Item> javaOnlyItems = new ObjectOpenHashSet<>();
            Collections.addAll(javaOnlyItems, Items.SPECTRAL_ARROW, Items.DEBUG_STICK,
                    Items.KNOWLEDGE_BOOK, Items.TIPPED_ARROW, Items.BUNDLE);
-            // these spawn eggs exist in 1.19.60+;
-            if (palette.getValue().protocolVersion() < Bedrock_v567.CODEC.getProtocolVersion()) {
-                Collections.addAll(javaOnlyItems, Items.IRON_GOLEM_SPAWN_EGG, Items.SNOW_GOLEM_SPAWN_EGG,
-                        Items.WITHER_SPAWN_EGG, Items.ENDER_DRAGON_SPAWN_EGG);
-            }
            javaOnlyItems.add(Items.DECORATED_POT);
            if (!customItemsAllowed) {
                javaOnlyItems.add(Items.FURNACE_MINECART);
@ -218,21 +199,18 @@ public class ItemRegistryPopulator {
                }

                String bedrockIdentifier;
-                // 1.19.70+
-                if (palette.getValue().protocolVersion() >= Bedrock_v575.CODEC.getProtocolVersion() && mappingItem.getBedrockIdentifier().equals("minecraft:wool")) {
+                if (mappingItem.getBedrockIdentifier().equals("minecraft:wool")) {
                    bedrockIdentifier = javaItem.javaIdentifier();
                } else {
                    bedrockIdentifier = mappingItem.getBedrockIdentifier();
                }

                //1.19.80+
-                if (palette.getValue().protocolVersion >= Bedrock_v582.CODEC.getProtocolVersion()) {
                if (mappingItem.getBedrockIdentifier().equals("minecraft:log") ||
                    mappingItem.getBedrockIdentifier().equals("minecraft:log2") ||
                    mappingItem.getBedrockIdentifier().equals("minecraft:fence")) {
                    bedrockIdentifier = javaItem.javaIdentifier();
                }
-                }

                ItemDefinition definition = definitions.get(bedrockIdentifier);
                if (definition == null) {
--- a/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/PistonBlockEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/PistonBlockEntity.java
@ -42,7 +42,6 @@ import org.geysermc.geyser.level.physics.Axis;
 import org.geysermc.geyser.level.physics.BoundingBox;
 import org.geysermc.geyser.level.physics.CollisionManager;
 import org.geysermc.geyser.level.physics.Direction;
-import org.geysermc.geyser.network.GameProtocol;
 import org.geysermc.geyser.registry.Registries;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.session.cache.PistonCache;
@ -622,10 +621,6 @@ public class PistonBlockEntity {
        Vector3i movement = getMovement();
        attachedBlocks.forEach((blockPos, javaId) -> {
            blockPos = blockPos.add(movement);
-            if (!GameProtocol.supports1_19_50(session)) {
-                // Send a final block entity packet to detach blocks for clients older than 1.19.50
-                BlockEntityUtils.updateBlockEntity(session, buildMovingBlockTag(blockPos, javaId, Direction.DOWN.getUnitVector()), blockPos);
-            }
            // Don't place blocks that collide with the player
            if (!SOLID_BOUNDING_BOX.checkIntersection(blockPos.toDouble(), session.getCollisionManager().getPlayerBoundingBox())) {
                ChunkUtils.updateBlock(session, javaId, blockPos);
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockBlockEntityDataTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockBlockEntityDataTranslator.java
@ -30,7 +30,6 @@ import com.github.steveice10.mc.protocol.packet.ingame.serverbound.level.Serverb
 import org.cloudburstmc.math.vector.Vector3i;
 import org.cloudburstmc.nbt.NbtMap;
 import org.cloudburstmc.protocol.bedrock.packet.BlockEntityDataPacket;
-import org.geysermc.geyser.network.GameProtocol;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.translator.protocol.PacketTranslator;
 import org.geysermc.geyser.translator.protocol.Translator;
@ -45,15 +44,9 @@ public class BedrockBlockEntityDataTranslator extends PacketTranslator<BlockEnti
        NbtMap tag = packet.getData();
        String id = tag.getString("id");
        if (id.equals("Sign")) {
-            String text;
-            if (GameProtocol.supports1_19_80(session)) {
            // The other side is called... you guessed it... BackText
-                text = tag.getCompound("FrontText")
-                        .getString("Text");
-            } else {
-                text = tag.getString("Text");
-            }
-            text = MessageTranslator.convertToPlainText(text);
+            String text = MessageTranslator.convertToPlainText(
+                tag.getCompound("FrontText").getString("Text"));
            // Note: as of 1.18.30, only one packet is sent from Bedrock when the sign is finished.
            // Previous versions did not have this behavior.
            StringBuilder newMessage = new StringBuilder();
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaUpdateRecipesTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaUpdateRecipesTranslator.java
@ -49,7 +49,6 @@ import org.geysermc.geyser.inventory.recipe.GeyserRecipe;
 import org.geysermc.geyser.inventory.recipe.GeyserShapedRecipe;
 import org.geysermc.geyser.inventory.recipe.GeyserShapelessRecipe;
 import org.geysermc.geyser.inventory.recipe.GeyserStonecutterData;
-import org.geysermc.geyser.network.GameProtocol;
 import org.geysermc.geyser.registry.Registries;
 import org.geysermc.geyser.registry.type.ItemMapping;
 import org.geysermc.geyser.session.GeyserSession;
@ -155,16 +154,9 @@ public class JavaUpdateRecipesTranslator extends PacketTranslator<ClientboundUpd
                        for (ItemStack addition : recipeData.getAddition().getOptions()) {
                            ItemDescriptorWithCount bedrockAddition = ItemDescriptorWithCount.fromItem(ItemTranslator.translateToBedrock(session, addition));

-                            if (GameProtocol.supports1_19_60(session)) {
                            // Note: vanilla inputs use aux value of Short.MAX_VALUE
                            craftingDataPacket.getCraftingData().add(SmithingTransformRecipeData.of(recipe.getIdentifier(),
                                    ItemDescriptorWithCount.EMPTY, bedrockBase, bedrockAddition, output, "smithing_table", netId++));
-                            } else {
-                                UUID uuid = UUID.randomUUID();
-                                craftingDataPacket.getCraftingData().add(org.cloudburstmc.protocol.bedrock.data.inventory.crafting.recipe.ShapelessRecipeData.shapeless(uuid.toString(),
-                                        List.of(bedrockBase, bedrockAddition),
-                                        Collections.singletonList(output), uuid, "smithing_table", 2, netId++));
-                            }
                        }
                    }
                }
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaOpenSignEditorTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaOpenSignEditorTranslator.java
@ -27,7 +27,6 @@ package org.geysermc.geyser.translator.protocol.java.level;

 import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundOpenSignEditorPacket;
 import org.cloudburstmc.protocol.bedrock.packet.OpenSignPacket;
-import org.geysermc.geyser.network.GameProtocol;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.translator.protocol.PacketTranslator;
 import org.geysermc.geyser.translator.protocol.Translator;
@ -37,11 +36,9 @@ public class JavaOpenSignEditorTranslator extends PacketTranslator<ClientboundOp

    @Override
    public void translate(GeyserSession session, ClientboundOpenSignEditorPacket packet) {
-        if (GameProtocol.supports1_19_80(session)) {
        OpenSignPacket openSignPacket = new OpenSignPacket();
        openSignPacket.setPosition(packet.getPosition());
        openSignPacket.setFrontSide(true); // Will be remedied in 1.20
        session.sendUpstreamPacket(openSignPacket);
    }
-    }
 }
--- a/core/src/main/java/org/geysermc/geyser/util/DimensionUtils.java
+++ b/core/src/main/java/org/geysermc/geyser/util/DimensionUtils.java
@ -36,7 +36,6 @@ import org.cloudburstmc.protocol.bedrock.packet.PlayerActionPacket;
 import org.cloudburstmc.protocol.bedrock.packet.StopSoundPacket;
 import org.geysermc.geyser.entity.type.Entity;
 import org.geysermc.geyser.level.BedrockDimension;
-import org.geysermc.geyser.network.GameProtocol;
 import org.geysermc.geyser.session.GeyserSession;

 import java.util.Set;
@ -122,9 +121,8 @@ public class DimensionUtils {
        stopSoundPacket.setSoundName("");
        session.sendUpstreamPacket(stopSoundPacket);

-        // Kind of silly but Bedrock 1.19.50 requires an acknowledgement after the
+        // Kind of silly but Bedrock 1.19.50 and later requires an acknowledgement after the
        // initial chunks are sent, prior to the client acknowledgement
-        if (GameProtocol.supports1_19_50(session)) {
        // Note: send this before chunks are sent. Fixed https://github.com/GeyserMC/Geyser/issues/3421
        PlayerActionPacket ackPacket = new PlayerActionPacket();
        ackPacket.setRuntimeEntityId(player.getGeyserId());
@ -133,7 +131,6 @@ public class DimensionUtils {
        ackPacket.setResultPosition(Vector3i.ZERO);
        ackPacket.setFace(0);
        session.sendUpstreamPacket(ackPacket);
-        }

        // TODO - fix this hack of a fix by sending the final dimension switching logic after sections have been sent.
        // The client wants sections sent to it before it can successfully respawn.
--- a/core/src/main/resources/bedrock/block_palette.1_19_20.nbt
+++ b/core/src/main/resources/bedrock/block_palette.1_19_20.nbt
--- a/core/src/main/resources/bedrock/block_palette.1_19_50.nbt
+++ b/core/src/main/resources/bedrock/block_palette.1_19_50.nbt
--- a/core/src/main/resources/bedrock/block_palette.1_19_60.nbt
+++ b/core/src/main/resources/bedrock/block_palette.1_19_60.nbt
--- a/core/src/main/resources/bedrock/block_palette.1_19_70.nbt
+++ b/core/src/main/resources/bedrock/block_palette.1_19_70.nbt
--- a/core/src/main/resources/bedrock/creative_items.1_19_20.json
+++ b/core/src/main/resources/bedrock/creative_items.1_19_20.json
--- a/core/src/main/resources/bedrock/creative_items.1_19_50.json
+++ b/core/src/main/resources/bedrock/creative_items.1_19_50.json
--- a/core/src/main/resources/bedrock/creative_items.1_19_60.json
+++ b/core/src/main/resources/bedrock/creative_items.1_19_60.json
--- a/core/src/main/resources/bedrock/creative_items.1_19_70.json
+++ b/core/src/main/resources/bedrock/creative_items.1_19_70.json
--- a/core/src/main/resources/bedrock/runtime_item_states.1_19_20.json
+++ b/core/src/main/resources/bedrock/runtime_item_states.1_19_20.json
--- a/core/src/main/resources/bedrock/runtime_item_states.1_19_50.json
+++ b/core/src/main/resources/bedrock/runtime_item_states.1_19_50.json
--- a/core/src/main/resources/bedrock/runtime_item_states.1_19_60.json
+++ b/core/src/main/resources/bedrock/runtime_item_states.1_19_60.json
--- a/core/src/main/resources/bedrock/runtime_item_states.1_19_70.json
+++ b/core/src/main/resources/bedrock/runtime_item_states.1_19_70.json