Fix some raid entities up (#2144)

* Fix some raid entities up

- Show axe when vindicator is attacking
- Show arm movement and spell color when evoker summons

* Reduce the amount of casting

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

@@ -42,7 +42,7 @@ public class AbstractSkeletonEntity extends MonsterEntity {
         if (entityMetadata.getId() == 14) {
             byte xd = (byte) entityMetadata.getValue();
             // A bit of a loophole so the hands get raised - set the target ID to its own ID
-            metadata.put(EntityData.TARGET_EID, (xd == 4) ? geyserId : 0);
+            metadata.put(EntityData.TARGET_EID, ((xd & 4) == 4) ? geyserId : 0);
         }
         super.updateBedrockMetadata(entityMetadata, session);
     }

connector/src/main/java/org/geysermc/connector/entity/living/monster/raid/SpellcasterIllagerEntity.java

@@ -25,13 +25,43 @@
 
 package org.geysermc.connector.entity.living.monster.raid;
 
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
 import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.living.monster.raid.AbstractIllagerEntity;
+import com.nukkitx.protocol.bedrock.data.entity.EntityData;
+import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
 import org.geysermc.connector.entity.type.EntityType;
+import org.geysermc.connector.network.session.GeyserSession;
 
 public class SpellcasterIllagerEntity extends AbstractIllagerEntity {
+    private static final int SUMMON_VEX_PARTICLE_COLOR = (179 << 16) | (179 << 8) | 204;
+    private static final int ATTACK_PARTICLE_COLOR = (102 << 16) | (77 << 8) | 89;
+    private static final int WOLOLO_PARTICLE_COLOR = (179 << 16) | (128 << 8) | 51;
 
     public SpellcasterIllagerEntity(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() == 16) {
+            int spellType = (int) (byte) entityMetadata.getValue();
+            // Summon vex, attack, or wololo
+            metadata.getFlags().setFlag(EntityFlag.CASTING, spellType == 1 || spellType == 2 || spellType == 3);
+            int rgbData = 0;
+            // Set the spell color based on Java values
+            switch (spellType) {
+                case 1:
+                    rgbData = SUMMON_VEX_PARTICLE_COLOR;
+                    break;
+                case 2:
+                    rgbData = ATTACK_PARTICLE_COLOR;
+                    break;
+                case 3:
+                    rgbData = WOLOLO_PARTICLE_COLOR;
+                    break;
+            }
+            metadata.put(EntityData.EVOKER_SPELL_COLOR, rgbData);
+        }
+        super.updateBedrockMetadata(entityMetadata, session);
+    }
 }

connector/src/main/java/org/geysermc/connector/entity/living/monster/raid/VindicatorEntity.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2019-2021 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.connector.entity.living.monster.raid;
+
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
+import com.nukkitx.math.vector.Vector3f;
+import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
+import org.geysermc.connector.entity.type.EntityType;
+import org.geysermc.connector.network.session.GeyserSession;
+
+public class VindicatorEntity extends AbstractIllagerEntity {
+
+    public VindicatorEntity(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) {
+        // Allow the axe to be shown if necessary
+        if (entityMetadata.getId() == 14) {
+            byte xd = (byte) entityMetadata.getValue();
+            metadata.getFlags().setFlag(EntityFlag.ANGRY, (xd & 4) == 4);
+        }
+        super.updateBedrockMetadata(entityMetadata, session);
+    }
+}

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

@@ -36,10 +36,7 @@ import org.geysermc.connector.entity.living.animal.tameable.WolfEntity;
 import org.geysermc.connector.entity.living.merchant.AbstractMerchantEntity;
 import org.geysermc.connector.entity.living.merchant.VillagerEntity;
 import org.geysermc.connector.entity.living.monster.*;
-import org.geysermc.connector.entity.living.monster.raid.AbstractIllagerEntity;
+import org.geysermc.connector.entity.living.monster.raid.*;
-import org.geysermc.connector.entity.living.monster.raid.PillagerEntity;
-import org.geysermc.connector.entity.living.monster.raid.RaidParticipantEntity;
-import org.geysermc.connector.entity.living.monster.raid.SpellcasterIllagerEntity;
 import org.geysermc.connector.entity.player.PlayerEntity;
 
 import java.util.ArrayList;
@@ -97,7 +94,7 @@ public enum EntityType {
     SHULKER(ShulkerEntity.class, 54, 1f, 1f),
     ENDERMITE(MonsterEntity.class, 55, 0.3f, 0.4f),
     AGENT(Entity.class, 56, 0f),
-    VINDICATOR(AbstractIllagerEntity.class, 57, 1.8f, 0.6f, 0.6f, 1.62f),
+    VINDICATOR(VindicatorEntity.class, 57, 1.8f, 0.6f, 0.6f, 1.62f),
     PILLAGER(PillagerEntity.class, 114, 1.8f, 0.6f, 0.6f, 1.62f),
     WANDERING_TRADER(AbstractMerchantEntity.class, 118, 1.8f, 0.6f, 0.6f, 1.62f),
     PHANTOM(FlyingEntity.class, 58, 0.5f, 0.9f, 0.9f, 0.6f),