Merge pull request #310 from DoctorMacc/villagers

Villager visuals

connector/src/main/java/org/geysermc/connector/entity/living/merchant/AbstractMerchantEntity.java

@@ -23,9 +23,10 @@
  * @link https://github.com/GeyserMC/Geyser
  */
 
-package org.geysermc.connector.entity.living;
+package org.geysermc.connector.entity.living.merchant;
 
 import com.nukkitx.math.vector.Vector3f;
+import org.geysermc.connector.entity.living.AgeableEntity;
 import org.geysermc.connector.entity.type.EntityType;
 
 public class AbstractMerchantEntity extends AgeableEntity {

connector/src/main/java/org/geysermc/connector/entity/living/merchant/VillagerEntity.java

@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2019-2020 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.merchant;
+
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.VillagerData;
+import com.nukkitx.math.vector.Vector3f;
+import com.nukkitx.protocol.bedrock.data.EntityData;
+import com.nukkitx.protocol.bedrock.packet.AddEntityPacket;
+import it.unimi.dsi.fastutil.ints.Int2IntMap;
+import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
+import org.geysermc.connector.entity.type.EntityType;
+import org.geysermc.connector.network.session.GeyserSession;
+
+public class VillagerEntity extends AbstractMerchantEntity {
+
+    private static final Int2IntMap VILLAGER_VARIANTS = new Int2IntOpenHashMap();
+    private static final Int2IntMap VILLAGER_REGIONS = new Int2IntOpenHashMap();
+
+    static {
+        // Java villager profession IDs -> Bedrock
+        VILLAGER_VARIANTS.put(0, 0);
+        VILLAGER_VARIANTS.put(1, 8);
+        VILLAGER_VARIANTS.put(2, 11);
+        VILLAGER_VARIANTS.put(3, 6);
+        VILLAGER_VARIANTS.put(4, 7);
+        VILLAGER_VARIANTS.put(5, 1);
+        VILLAGER_VARIANTS.put(6, 2);
+        VILLAGER_VARIANTS.put(7, 4);
+        VILLAGER_VARIANTS.put(8, 12);
+        VILLAGER_VARIANTS.put(9, 5);
+        VILLAGER_VARIANTS.put(10, 13);
+        VILLAGER_VARIANTS.put(11, 14);
+        VILLAGER_VARIANTS.put(12, 3);
+        VILLAGER_VARIANTS.put(13, 10);
+        VILLAGER_VARIANTS.put(14, 9);
+
+        VILLAGER_REGIONS.put(0, 1);
+        VILLAGER_REGIONS.put(1, 2);
+        VILLAGER_REGIONS.put(2, 0);
+        VILLAGER_REGIONS.put(3, 3);
+        VILLAGER_REGIONS.put(4, 4);
+        VILLAGER_REGIONS.put(5, 5);
+        VILLAGER_REGIONS.put(6, 6);
+    }
+
+    public VillagerEntity(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() == 17) {
+            VillagerData villagerData = (VillagerData) entityMetadata.getValue();
+            // Profession
+            metadata.put(EntityData.VARIANT, VILLAGER_VARIANTS.get(villagerData.getProfession()));
+            //metadata.put(EntityData.SKIN_ID, villagerData.getType()); Looks like this is modified but for any reason?
+            // Region
+            metadata.put(EntityData.MARK_VARIANT, VILLAGER_REGIONS.get(villagerData.getType()));
+            // Trade tier - different indexing in Bedrock
+            metadata.put(EntityData.TRADE_TIER, villagerData.getLevel() - 1);
+        }
+        super.updateBedrockMetadata(entityMetadata, session);
+    }
+
+    @Override
+    public void spawnEntity(GeyserSession session) {
+        AddEntityPacket addEntityPacket = new AddEntityPacket();
+        // "v2" or else it's the legacy villager
+        addEntityPacket.setIdentifier("minecraft:villager_v2");
+        addEntityPacket.setRuntimeEntityId(geyserId);
+        addEntityPacket.setUniqueEntityId(geyserId);
+        addEntityPacket.setPosition(position);
+        addEntityPacket.setMotion(motion);
+        addEntityPacket.setRotation(getBedrockRotation());
+        addEntityPacket.setEntityType(entityType.getType());
+        addEntityPacket.getMetadata().putAll(metadata);
+
+        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/type/EntityType.java

@@ -31,6 +31,7 @@ import org.geysermc.connector.entity.living.*;
 import org.geysermc.connector.entity.living.animal.*;
 import org.geysermc.connector.entity.living.animal.horse.*;
 import org.geysermc.connector.entity.living.animal.tameable.*;
+import org.geysermc.connector.entity.living.merchant.*;
 import org.geysermc.connector.entity.living.monster.*;
 import org.geysermc.connector.entity.living.monster.raid.AbstractIllagerEntity;
 import org.geysermc.connector.entity.living.monster.raid.RaidParticipantEntity;
@@ -44,7 +45,7 @@ public enum EntityType {
     PIG(PigEntity.class, 12, 0.9f),
     SHEEP(SheepEntity.class, 13, 1.3f, 0.9f),
     WOLF(WolfEntity.class, 14, 0.85f, 0.6f),
-    VILLAGER(AbstractMerchantEntity.class, 15, 1.8f, 0.6f, 0.6f, 1.62f),
+    VILLAGER(VillagerEntity.class, 15, 1.8f, 0.6f, 0.6f, 1.62f),
     MOOSHROOM(AnimalEntity.class, 16, 1.4f, 0.9f),
     SQUID(WaterEntity.class, 17, 0.8f),
     RABBIT(RabbitEntity.class, 18, 0.5f, 0.4f),