Fix ender dragon; add enderman

connector/src/main/java/org/geysermc/connector/entity/living/monster/EnderDragonEntity.java

@@ -2,6 +2,12 @@ package org.geysermc.connector.entity.living.monster;
 
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
 import com.nukkitx.math.vector.Vector3f;
+import com.nukkitx.protocol.bedrock.data.Attribute;
+import com.nukkitx.protocol.bedrock.data.EntityData;
+import com.nukkitx.protocol.bedrock.data.EntityEventType;
+import com.nukkitx.protocol.bedrock.data.EntityFlag;
+import com.nukkitx.protocol.bedrock.packet.AddEntityPacket;
+import com.nukkitx.protocol.bedrock.packet.EntityEventPacket;
 import org.geysermc.connector.entity.living.InsentientEntity;
 import org.geysermc.connector.entity.type.EntityType;
 import org.geysermc.connector.network.session.GeyserSession;
@@ -15,6 +21,43 @@ public class EnderDragonEntity extends InsentientEntity {
     @Override
     public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
         System.out.println("Ender Dragon ID: " + entityMetadata.getId() + " Value: " + entityMetadata.getValue());
+        if (entityMetadata.getId() == 15) {
+            metadata.getFlags().setFlag(EntityFlag.FIRE_IMMUNE, true);
+            switch ((int) entityMetadata.getValue()) {
+                // Performing breath attack
+                case 5:
+                    EntityEventPacket entityEventPacket = new EntityEventPacket();
+                    entityEventPacket.setType(EntityEventType.DRAGON_FLAMING);
+                    entityEventPacket.setRuntimeEntityId(geyserId);
+                    entityEventPacket.setData(0);
+                    session.getUpstream().sendPacket(entityEventPacket);
+                case 6:
+                case 7:
+                    metadata.getFlags().setFlag(EntityFlag.SITTING, true);
+                    break;
+            }
+        }
         super.updateBedrockMetadata(entityMetadata, session);
     }
+
+    @Override
+    public void spawnEntity(GeyserSession session) {
+        AddEntityPacket addEntityPacket = new AddEntityPacket();
+        addEntityPacket.setIdentifier("minecraft:" + entityType.name().toLowerCase());
+        addEntityPacket.setRuntimeEntityId(geyserId);
+        addEntityPacket.setUniqueEntityId(geyserId);
+        addEntityPacket.setPosition(position);
+        addEntityPacket.setMotion(motion);
+        addEntityPacket.setRotation(getBedrockRotation());
+        addEntityPacket.setEntityType(entityType.getType());
+        addEntityPacket.getMetadata().putAll(metadata);
+
+        // Otherwise dragon is always 'dying'
+        addEntityPacket.getAttributes().add(new Attribute("minecraft:health", 0.0f, 200f, 200f, 200f));
+
+        valid = true;
+        session.getUpstream().sendPacket(addEntityPacket);
+
+        session.getConnector().getLogger().debug("Spawned entity " + entityType + " at location " + position + " with id " + geyserId + " (java id " + entityId + ")");
+    }
 }

connector/src/main/java/org/geysermc/connector/entity/living/monster/EndermanEntity.java

@@ -0,0 +1,34 @@
+package org.geysermc.connector.entity.living.monster;
+
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
+import com.github.steveice10.mc.protocol.data.game.world.block.BlockState;
+import com.github.steveice10.mc.protocol.data.game.world.block.value.PistonValueType;
+import com.nukkitx.math.vector.Vector3f;
+import com.nukkitx.protocol.bedrock.data.EntityData;
+import com.nukkitx.protocol.bedrock.data.EntityFlag;
+import org.geysermc.connector.entity.type.EntityType;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.block.BlockTranslator;
+
+public class EndermanEntity extends MonsterEntity {
+
+    public EndermanEntity(long entityId, long geyserId, EntityType entityType, Vector3f position, Vector3f motion, Vector3f rotation) {
+        super(entityId, geyserId, entityType, position, motion, rotation);
+    }
+
+    @Override
+    public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
+        if (entityMetadata.getId() == 15) {
+            System.out.println("Block: " + entityMetadata.getValue());
+            metadata.put(EntityData.ENDERMAN_HELD_ITEM_ID, BlockTranslator.getBedrockBlockId((BlockState) entityMetadata.getValue()));
+        }
+        if (entityMetadata.getId() == 16) {
+            System.out.println("Is screaming? " + (boolean) entityMetadata.getValue());
+            metadata.getFlags().setFlag(EntityFlag.ANGRY, (boolean) entityMetadata.getValue());
+        }
+        if (entityMetadata.getId() == 17) {
+            System.out.println("Is stared at? " + (boolean) entityMetadata.getValue());
+        }
+        super.updateBedrockMetadata(entityMetadata, session);
+    }
+}

connector/src/main/java/org/geysermc/connector/entity/type/EntityType.java

@@ -69,7 +69,7 @@ public enum EntityType {
     SPIDER(SpiderEntity.class, 35, 0.9f, 1.4f, 1.4f, 1f),
     ZOMBIE_PIGMAN(MonsterEntity.class, 36, 1.8f, 0.6f, 0.6f, 1.62f),
     SLIME(InsentientEntity.class, 37, 0.51f),
-    ENDERMAN(MonsterEntity.class, 38, 2.9f, 0.6f),
+    ENDERMAN(EndermanEntity.class, 38, 2.9f, 0.6f),
     SILVERFISH(MonsterEntity.class, 39, 0.3f, 0.4f),
     CAVE_SPIDER(MonsterEntity.class, 40, 0.5f, 0.7f),
     GHAST(FlyingEntity.class, 41, 4.0f),