changed look property a bit

api/src/main/java/lol/pyr/znpcsplus/util/LookType.java

@@ -0,0 +1,7 @@
+package lol.pyr.znpcsplus.util;
+
+public enum LookType {
+    FIXED,
+    CLOSEST_PLAYER,
+    PER_PLAYER
+}

plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlus.java

@@ -276,6 +276,7 @@ public class ZNpcsPlus extends JavaPlugin {
         registerEnumParser(manager, OcelotType.class, incorrectUsageMessage);
         registerEnumParser(manager, PandaGene.class, incorrectUsageMessage);
         registerEnumParser(manager, PuffState.class, incorrectUsageMessage);
+        registerEnumParser(manager, LookType.class, incorrectUsageMessage);
 
         manager.registerCommand("npc", new MultiCommand(loadHelpMessage("root"))
                 .addSubcommand("center", new CenterCommand(npcRegistry))

plugin/src/main/java/lol/pyr/znpcsplus/conversion/citizens/model/traits/LookTrait.java

@@ -3,6 +3,7 @@ package lol.pyr.znpcsplus.conversion.citizens.model.traits;
 import lol.pyr.znpcsplus.api.entity.EntityPropertyRegistry;
 import lol.pyr.znpcsplus.conversion.citizens.model.SectionCitizensTrait;
 import lol.pyr.znpcsplus.npc.NpcImpl;
+import lol.pyr.znpcsplus.util.LookType;
 import org.bukkit.configuration.ConfigurationSection;
 import org.jetbrains.annotations.NotNull;
 
@@ -16,7 +17,7 @@ public class LookTrait extends SectionCitizensTrait {
 
     @Override
     public @NotNull NpcImpl apply(NpcImpl npc, ConfigurationSection section) {
-        if (section.getBoolean("enabled")) npc.setProperty(registry.getByName("look", Boolean.class), true);
+        if (section.getBoolean("enabled")) npc.setProperty(registry.getByName("look", LookType.class), LookType.CLOSEST_PLAYER);
         return npc;
     }
 }

plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java

@@ -53,6 +53,7 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
         registerSerializer(new Vector3fPropertySerializer());
         registerSerializer(new BlockStatePropertySerializer());
         registerSerializer(new IntegerPropertySerializer());
+        registerSerializer(new LookTypeSerializer());
 
         registerEnumSerializer(NpcPose.class);
         registerEnumSerializer(DyeColor.class);
@@ -142,7 +143,7 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
         register(new NameProperty(legacyNames, optionalComponents));
         register(new DinnerboneProperty(legacyNames, optionalComponents));
 
-        register(new DummyProperty<>("look", false));
+        register(new DummyProperty<>("look", LookType.FIXED));
         register(new GlowProperty(packetFactory));
         register(new BitsetProperty("fire", 0, 0x01));
         register(new BitsetProperty("invisible", 0, 0x20));

plugin/src/main/java/lol/pyr/znpcsplus/entity/PacketEntity.java

@@ -60,6 +60,10 @@ public class PacketEntity implements PropertyHolder {
         else packetFactory.spawnEntity(player, this, properties);
     }
 
+    public void setHeadRotation(Player player, float yaw, float pitch) {
+        packetFactory.sendHeadRotation(player, this, yaw, pitch);
+    }
+
     public void despawn(Player player) {
         packetFactory.destroyEntity(player, this, properties);
     }

plugin/src/main/java/lol/pyr/znpcsplus/entity/serializers/LookTypeSerializer.java

@@ -0,0 +1,26 @@
+package lol.pyr.znpcsplus.entity.serializers;
+
+import lol.pyr.znpcsplus.entity.PropertySerializer;
+import lol.pyr.znpcsplus.util.LookType;
+
+public class LookTypeSerializer implements PropertySerializer<LookType> {
+    @Override
+    public String serialize(LookType property) {
+        return property.name();
+    }
+
+    @Override
+    public LookType deserialize(String property) {
+        if (property.equals("true")) return LookType.CLOSEST_PLAYER;
+        try {
+             return LookType.valueOf(property);
+        } catch (IllegalArgumentException ignored) {
+            return LookType.FIXED;
+        }
+    }
+
+    @Override
+    public Class<LookType> getTypeClass() {
+        return LookType.class;
+    }
+}

plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcImpl.java

@@ -83,6 +83,10 @@ public class NpcImpl extends Viewable implements Npc {
         hologram.setLocation(location.withY(location.getY() + type.getHologramOffset()));
     }
 
+    public void setHeadRotation(Player player, float yaw, float pitch) {
+        entity.setHeadRotation(player, yaw, pitch);
+    }
+
     public HologramImpl getHologram() {
         return hologram;
     }

plugin/src/main/java/lol/pyr/znpcsplus/packets/PacketFactory.java

@@ -22,4 +22,5 @@ public interface PacketFactory {
     void sendAllMetadata(Player player, PacketEntity entity, PropertyHolder properties);
     void sendEquipment(Player player, PacketEntity entity, Equipment equipment);
     void sendMetadata(Player player, PacketEntity entity, List<EntityData> data);
+    void sendHeadRotation(Player player, PacketEntity entity, float yaw, float pitch);
 }

plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_8PacketFactory.java

@@ -137,6 +137,12 @@ public class V1_8PacketFactory implements PacketFactory {
         sendPacket(player, new WrapperPlayServerEntityMetadata(entity.getEntityId(), data));
     }
 
+    @Override
+    public void sendHeadRotation(Player player, PacketEntity entity, float yaw, float pitch) {
+        sendPacket(player, new WrapperPlayServerEntityHeadLook(entity.getEntityId(),yaw));
+        sendPacket(player, new WrapperPlayServerEntityRotation(entity.getEntityId(), yaw, pitch, true));
+    }
+
     @Override
     public void sendEquipment(Player player, PacketEntity entity, Equipment equipment) {
         sendPacket(player, new WrapperPlayServerEntityEquipment(entity.getEntityId(), Collections.singletonList(equipment)));

plugin/src/main/java/lol/pyr/znpcsplus/tasks/NpcProcessorTask.java

@@ -8,6 +8,7 @@ import lol.pyr.znpcsplus.entity.EntityPropertyRegistryImpl;
 import lol.pyr.znpcsplus.npc.NpcEntryImpl;
 import lol.pyr.znpcsplus.npc.NpcImpl;
 import lol.pyr.znpcsplus.npc.NpcRegistryImpl;
+import lol.pyr.znpcsplus.util.LookType;
 import lol.pyr.znpcsplus.util.NpcLocation;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -28,13 +29,14 @@ public class NpcProcessorTask extends BukkitRunnable {
     public void run() {
         double distSq = NumberConversions.square(configManager.getConfig().viewDistance());
         double lookPropertyDistSq = NumberConversions.square(configManager.getConfig().lookPropertyDistance());
-        EntityPropertyImpl<Boolean> lookProperty = propertyRegistry.getByName("look", Boolean.class);
+        EntityPropertyImpl<LookType> lookProperty = propertyRegistry.getByName("look", LookType.class);
         for (NpcEntryImpl entry : npcRegistry.getProcessable()) {
             NpcImpl npc = entry.getNpc();
             if (!npc.isEnabled()) continue;
 
             double closestDist = Double.MAX_VALUE;
             Player closest = null;
+            LookType lookType = npc.getProperty(lookProperty);
             for (Player player : Bukkit.getOnlinePlayers()) {
                 if (!player.getWorld().equals(npc.getWorld())) {
                     if (npc.isVisibleTo(player)) npc.hide(player);
@@ -60,13 +62,19 @@ public class NpcProcessorTask extends BukkitRunnable {
                         closestDist = distance;
                         closest = player;
                     }
+                    if (lookType.equals(LookType.PER_PLAYER) && lookPropertyDistSq >= distance) {
+                        NpcLocation expected = npc.getLocation().lookingAt(player.getLocation().add(0, -npc.getType().getHologramOffset(), 0));
+                        if (!expected.equals(npc.getLocation())) npc.setHeadRotation(player, expected.getYaw(), expected.getPitch());
+                    }
                 }
             }
             // look property
-            if (closest != null && npc.getProperty(lookProperty) && lookPropertyDistSq >= closestDist) {
+            if (lookType.equals(LookType.CLOSEST_PLAYER)) {
+                if (closest != null && lookPropertyDistSq >= closestDist) {
                     NpcLocation expected = npc.getLocation().lookingAt(closest.getLocation().add(0, -npc.getType().getHologramOffset(), 0));
                     if (!expected.equals(npc.getLocation())) npc.setLocation(expected);
                 }
             }
         }
+    }
 }