Merge pull request #3432 from Konicai/JE-1.19.3

More 1.19.3 support

core/src/main/java/org/geysermc/geyser/entity/EntityDefinitions.java

@@ -60,6 +60,7 @@ public final class EntityDefinitions {
     public static final EntityDefinition<BeeEntity> BEE;
     public static final EntityDefinition<BlazeEntity> BLAZE;
     public static final EntityDefinition<BoatEntity> BOAT;
+    public static final EntityDefinition<CamelEntity> CAMEL;
     public static final EntityDefinition<CatEntity> CAT;
     public static final EntityDefinition<SpiderEntity> CAVE_SPIDER;
     public static final EntityDefinition<MinecartEntity> CHEST_MINECART;
@@ -859,6 +860,13 @@ public final class EntityDefinitions {
                     .addTranslator(MetadataType.BYTE, AbstractHorseEntity::setHorseFlags)
                     .addTranslator(null) // UUID of owner
                     .build();
+            CAMEL = EntityDefinition.inherited(CamelEntity::new, abstractHorseEntityBase)
+                    .type(EntityType.CAMEL)
+                    .identifier("minecraft:llama") // todo 1.20
+                    .height(2.375f).width(1.7f)
+                    .addTranslator(MetadataType.BOOLEAN, CamelEntity::setDashing)
+                    .addTranslator(null) // Last pose change tick
+                    .build();
             HORSE = EntityDefinition.inherited(HorseEntity::new, abstractHorseEntityBase)
                     .type(EntityType.HORSE)
                     .height(1.6f).width(1.3965f)

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

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.geyser.entity.type.living.animal.horse;
+
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.Pose;
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
+import com.nukkitx.math.vector.Vector3f;
+import com.nukkitx.protocol.bedrock.data.entity.EntityData;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.registry.type.ItemMapping;
+import org.geysermc.geyser.session.GeyserSession;
+
+import java.util.UUID;
+
+public class CamelEntity extends AbstractHorseEntity {
+
+    private static final float SITTING_HEIGHT_DIFFERENCE = 1.43F;
+
+    public CamelEntity(GeyserSession session, int entityId, long geyserId, UUID uuid, EntityDefinition<?> definition, Vector3f position, Vector3f motion, float yaw, float pitch, float headYaw) {
+        super(session, entityId, geyserId, uuid, definition, position, motion, yaw, pitch, headYaw);
+    }
+
+    @Override
+    protected void initializeMetadata() {
+        super.initializeMetadata();
+        this.dirtyMetadata.put(EntityData.VARIANT, 2); // Closest llama colour to camel
+    }
+
+    @Override
+    public boolean canEat(String javaIdentifierStripped, ItemMapping mapping) {
+        return "cactus".equals(javaIdentifierStripped);
+    }
+
+    @Override
+    protected void setDimensions(Pose pose) {
+        if (pose == Pose.SITTING) {
+            setBoundingBoxWidth(definition.height() - SITTING_HEIGHT_DIFFERENCE);
+            setBoundingBoxWidth(definition.width());
+        } else {
+            super.setDimensions(pose);
+        }
+    }
+
+    public void setDashing(BooleanEntityMetadata entityMetadata) {
+
+    }
+}

core/src/main/java/org/geysermc/geyser/network/GameProtocol.java

@@ -60,6 +60,14 @@ public final class GameProtocol {
     private static final PacketCodec DEFAULT_JAVA_CODEC = MinecraftCodec.CODEC;
 
     static {
+        SUPPORTED_BEDROCK_CODECS.add(Bedrock_v544.V544_CODEC);
+        SUPPORTED_BEDROCK_CODECS.add(Bedrock_v545.V545_CODEC.toBuilder()
+                .minecraftVersion("1.19.21/1.19.22")
+                .build());
+        SUPPORTED_BEDROCK_CODECS.add(Bedrock_v554.V554_CODEC.toBuilder()
+                .minecraftVersion("1.19.30/1.19.31")
+                .build());
+        SUPPORTED_BEDROCK_CODECS.add(Bedrock_v557.V557_CODEC);
         SUPPORTED_BEDROCK_CODECS.add(DEFAULT_BEDROCK_CODEC);
     }
 
@@ -77,6 +85,16 @@ 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_30(GeyserSession session) {
+        return session.getUpstream().getProtocolVersion() >= Bedrock_v554.V554_CODEC.getProtocolVersion();
+    }
+
+    public static boolean supports1_19_50(GeyserSession session) {
+        return session.getUpstream().getProtocolVersion() >= Bedrock_v560.V560_CODEC.getProtocolVersion();
+    }
+
     /**
      * Gets the {@link PacketCodec} for Minecraft: Java Edition.
      *

core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java

@@ -29,6 +29,8 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.google.common.collect.ImmutableMap;
 import com.nukkitx.nbt.*;
+import com.nukkitx.protocol.bedrock.v527.Bedrock_v527;
+import com.nukkitx.protocol.bedrock.v544.Bedrock_v544;
 import com.nukkitx.protocol.bedrock.v560.Bedrock_v560;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.ints.IntSet;
@@ -72,6 +74,7 @@ public final class BlockRegistryPopulator {
     private static void registerBedrockBlocks() {
         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.V544_CODEC.getProtocolVersion()), emptyMapper)
                 .put(ObjectIntPair.of("1_19_50", Bedrock_v560.V560_CODEC.getProtocolVersion()), emptyMapper)
                 .build();
 

core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java

@@ -77,6 +77,7 @@ public class ItemRegistryPopulator {
 
     public static void populate() {
         Map<String, PaletteVersion> paletteVersions = new Object2ObjectOpenHashMap<>();
+        paletteVersions.put("1_19_20", new PaletteVersion(Bedrock_v544.V544_CODEC.getProtocolVersion(), Collections.emptyMap()));
         paletteVersions.put("1_19_50", new PaletteVersion(Bedrock_v560.V560_CODEC.getProtocolVersion(), Collections.emptyMap()));
 
         GeyserBootstrap bootstrap = GeyserImpl.getInstance().getBootstrap();

core/src/main/java/org/geysermc/geyser/translator/level/block/entity/SignBlockEntityTranslator.java

@@ -32,7 +32,7 @@ import com.nukkitx.nbt.NbtMapBuilder;
 import org.geysermc.geyser.translator.text.MessageTranslator;
 import org.geysermc.geyser.util.SignUtils;
 
-@BlockEntity(type = BlockEntityType.SIGN)
+@BlockEntity(type = {BlockEntityType.SIGN, BlockEntityType.HANGING_SIGN})
 public class SignBlockEntityTranslator extends BlockEntityTranslator {
     /**
      * Maps a color stored in a sign's Color tag to its ARGB value.
@@ -88,6 +88,7 @@ public class SignBlockEntityTranslator extends BlockEntityTranslator {
                     signWidth += SignUtils.getCharacterWidth(c);
                 }
 
+                // todo 1.20: update for hanging signs (smaller width). Currently OK because bedrock sees hanging signs as normal signs
                 if (signWidth <= SignUtils.BEDROCK_CHARACTER_WIDTH_MAX) {
                     finalSignLine.append(c);
                 } else {

core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockBlockEntityDataTranslator.java

@@ -57,6 +57,10 @@ public class BedrockBlockEntityDataTranslator extends PacketTranslator<BlockEnti
             // This converts the message into the array'd message Java wants
             for (char character : text.toCharArray()) {
                 widthCount += SignUtils.getCharacterWidth(character);
+
+                // todo 1.20: update for hanging signs (smaller width). Currently bedrock thinks hanging signs are normal,
+                // so it thinks hanging signs have more width than they actually do. Seems like JE just truncates it.
+
                 // If we get a return in Bedrock, or go over the character width max, that signals to use the next line.
                 if (character == '\n' || widthCount > SignUtils.JAVA_CHARACTER_WIDTH_MAX) {
                     // We need to apply some more logic if we went over the character width max

core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockRequestAbilityTranslator.java

@@ -43,6 +43,11 @@ public class BedrockRequestAbilityTranslator extends PacketTranslator<RequestAbi
 
     @Override
     public void translate(GeyserSession session, RequestAbilityPacket packet) {
+        // Gatekeep to 1.19.30 so older versions don't fire twice
+        if (!GameProtocol.supports1_19_30(session)) {
+            return;
+        }
+        
         if (packet.getAbility() == Ability.FLYING) {
             handle(session, packet.isBoolValue());
         }

core/src/main/java/org/geysermc/geyser/util/DimensionUtils.java

@@ -125,14 +125,16 @@ public class DimensionUtils {
 
         // Kind of silly but Bedrock 1.19.50 requires an acknowledgement after the
         // initial chunks are sent, prior to the client acknowledgement
-        // Note: send this before chunks are sent. Fixed https://github.com/GeyserMC/Geyser/issues/3421
-        PlayerActionPacket ackPacket = new PlayerActionPacket();
-        ackPacket.setRuntimeEntityId(player.getGeyserId());
-        ackPacket.setAction(PlayerActionType.DIMENSION_CHANGE_SUCCESS);
-        ackPacket.setBlockPosition(Vector3i.ZERO);
-        ackPacket.setResultPosition(Vector3i.ZERO);
-        ackPacket.setFace(0);
-        session.sendUpstreamPacket(ackPacket);
+        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());
+            ackPacket.setAction(PlayerActionType.DIMENSION_CHANGE_SUCCESS);
+            ackPacket.setBlockPosition(Vector3i.ZERO);
+            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.

core/src/main/resources/mappings

@@ -1 +1 @@
-Subproject commit 5bd26dd735bd89dd50e5c55a0d022f7c70916300
+Subproject commit e8703ccb187f98cd845357395d7b4ecfafbcd864