From cdd0459d47933142d0258d5f11c67e0c82f7b2b6 Mon Sep 17 00:00:00 2001 From: Konicai <71294714+Konicai@users.noreply.github.com> Date: Mon, 26 Jun 2023 12:04:28 -0400 Subject: [PATCH] Implement interaction entity (#3916) --- .../geyser/entity/EntityDefinitions.java | 10 +++ .../geyser/entity/type/InteractionEntity.java | 89 +++++++++++++++++++ .../registry/PacketTranslatorRegistry.java | 2 + 3 files changed, 101 insertions(+) create mode 100644 core/src/main/java/org/geysermc/geyser/entity/type/InteractionEntity.java diff --git a/core/src/main/java/org/geysermc/geyser/entity/EntityDefinitions.java b/core/src/main/java/org/geysermc/geyser/entity/EntityDefinitions.java index de58cc26c..a8d35b6f3 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/EntityDefinitions.java +++ b/core/src/main/java/org/geysermc/geyser/entity/EntityDefinitions.java @@ -104,6 +104,7 @@ public final class EntityDefinitions { public static final EntityDefinition HORSE; public static final EntityDefinition HUSK; public static final EntityDefinition ILLUSIONER; // Not present on Bedrock + public static final EntityDefinition INTERACTION; public static final EntityDefinition IRON_GOLEM; public static final EntityDefinition ITEM; public static final EntityDefinition ITEM_FRAME; @@ -319,6 +320,15 @@ public final class EntityDefinitions { .addTranslator(MetadataType.CHAT, TextDisplayEntity::setText) .build(); + INTERACTION = EntityDefinition.inherited(InteractionEntity::new, entityBase) + .type(EntityType.INTERACTION) + .heightAndWidth(1.0f) // default size until server specifies otherwise + .identifier("minecraft:armor_stand") + .addTranslator(MetadataType.FLOAT, InteractionEntity::setWidth) + .addTranslator(MetadataType.FLOAT, InteractionEntity::setHeight) + .addTranslator(MetadataType.BOOLEAN, InteractionEntity::setResponse) + .build(); + EntityDefinition fireballBase = EntityDefinition.inherited(FireballEntity::new, entityBase) .addTranslator(null) // Item .build(); diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/InteractionEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/InteractionEntity.java new file mode 100644 index 000000000..c88f90f19 --- /dev/null +++ b/core/src/main/java/org/geysermc/geyser/entity/type/InteractionEntity.java @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2019-2023 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; + +import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata; +import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.FloatEntityMetadata; +import com.github.steveice10.mc.protocol.data.game.entity.player.Hand; +import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundSwingPacket; +import org.cloudburstmc.math.vector.Vector3f; +import org.cloudburstmc.protocol.bedrock.data.entity.EntityFlag; +import org.cloudburstmc.protocol.bedrock.packet.AnimatePacket; +import org.geysermc.geyser.entity.EntityDefinition; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.util.InteractionResult; + +import java.util.UUID; + +public class InteractionEntity extends Entity { + + /** + * true - java client hears swing sound when attacking, and arm swings when right-clicking + * false - java client hears no swing sound when attacking, and arm does not swing when right-clicking + */ + private boolean response = false; + + public InteractionEntity(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(); + + // hide the armor stand but keep the hitbox active + setFlag(EntityFlag.INVISIBLE, true); + } + + @Override + public InteractionResult interact(Hand hand) { + // these InteractionResults do mirror the java client + // but the bedrock client won't arm swing itself because of our armor stand workaround + if (response) { + AnimatePacket animatePacket = new AnimatePacket(); + animatePacket.setRuntimeEntityId(session.getPlayerEntity().getGeyserId()); + animatePacket.setAction(AnimatePacket.Action.SWING_ARM); + session.sendUpstreamPacket(animatePacket); + + session.sendDownstreamPacket(new ServerboundSwingPacket(hand)); + return InteractionResult.SUCCESS; + } + + return InteractionResult.CONSUME; + } + + public void setWidth(FloatEntityMetadata width) { + setBoundingBoxWidth(width.getPrimitiveValue()); + } + + public void setHeight(FloatEntityMetadata height) { + setBoundingBoxHeight(height.getPrimitiveValue()); + } + + public void setResponse(BooleanEntityMetadata response) { + this.response = response.getPrimitiveValue(); + } +} diff --git a/core/src/main/java/org/geysermc/geyser/registry/PacketTranslatorRegistry.java b/core/src/main/java/org/geysermc/geyser/registry/PacketTranslatorRegistry.java index 0acfeee93..61999d4f6 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/PacketTranslatorRegistry.java +++ b/core/src/main/java/org/geysermc/geyser/registry/PacketTranslatorRegistry.java @@ -25,6 +25,7 @@ package org.geysermc.geyser.registry; +import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundDelimiterPacket; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundTabListPacket; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundLightUpdatePacket; import io.netty.channel.EventLoop; @@ -44,6 +45,7 @@ public class PacketTranslatorRegistry extends AbstractMappedRegistry