Final touches

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

@@ -1,3 +1,28 @@
+/*
+ * 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;
@@ -13,6 +38,7 @@ import org.geysermc.connector.network.session.GeyserSession;
 public class VillagerEntity extends AbstractMerchantEntity {
 
     public static Int2IntMap VILLAGER_VARIANTS = new Int2IntOpenHashMap();
+    public static Int2IntMap VILLAGER_REGIONS = new Int2IntOpenHashMap();
 
     static {
         // Java villager profession IDs -> Bedrock
@@ -31,6 +57,14 @@ public class VillagerEntity extends AbstractMerchantEntity {
         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) {
@@ -39,11 +73,14 @@ public class VillagerEntity extends AbstractMerchantEntity {
 
     @Override
     public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
-        System.out.println("ID: " + entityMetadata.getId() + ", " + entityMetadata.getValue());
         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());
+            //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);