Merge pull request #13 from juliarn/development

Update 1.1-RELEASE

README.md

@@ -18,7 +18,7 @@ Maven
 <dependency>
     <groupId>com.github.juliarn</groupId>
     <artifactId>npc-lib</artifactId>
-    <version>1.0-RELEASE</version>
+    <version>1.1-RELEASE</version>
 </dependency>
 ```
 
@@ -29,7 +29,7 @@ maven {
     url 'https://jitpack.io'
 }
 
-compile group: 'com.github.juliarn', name: 'npc-lib', version: '1.0-RELEASE'
+compile group: 'com.github.juliarn', name: 'npc-lib', version: '1.1-RELEASE'
 ```
 
 Add ProtocolLib as dependency to your plugin.yml. It could look like this:

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.juliarn</groupId>
     <artifactId>npc-lib</artifactId>
-    <version>1.0-RELEASE</version>
+    <version>1.1-RELEASE</version>
     <packaging>jar</packaging>
 
     <properties>

src/main/java/com/github/juliarn/npc/NPC.java

@@ -31,7 +31,7 @@ public class NPC {
 
     private boolean imitatePlayer;
 
-    private SpawnCustomizer spawnCustomizer;
+    private final SpawnCustomizer spawnCustomizer;
 
     private NPC(Set<ProfileProperty> profileProperties, WrappedGameProfile gameProfile, Location location, boolean lookAtPlayer, boolean imitatePlayer, SpawnCustomizer spawnCustomizer) {
         this.gameProfile = gameProfile;
@@ -174,7 +174,7 @@ public static class Builder {
 
         private Set<ProfileProperty> profileProperties;
 
-        private String name;
+        private final String name;
 
         private UUID textureUUID;
 

src/main/java/com/github/juliarn/npc/NPCPool.java

@@ -29,13 +29,13 @@
 
 public class NPCPool implements Listener {
 
-    private JavaPlugin javaPlugin;
+    private final JavaPlugin javaPlugin;
 
-    private int spawnDistance;
+    private final double spawnDistance;
 
-    private int actionDistance;
+    private final double actionDistance;
 
-    private Map<Integer, NPC> npcMap = new ConcurrentHashMap<>();
+    private final Map<Integer, NPC> npcMap = new ConcurrentHashMap<>();
 
     /**
      * Creates a new NPC pool which handles events, spawning and destruction of the NPCs for players
@@ -59,8 +59,8 @@ public NPCPool(@NotNull JavaPlugin javaPlugin, int spawnDistance, int actionDist
 
         this.javaPlugin = javaPlugin;
 
-        this.spawnDistance = spawnDistance;
-        this.actionDistance = actionDistance;
+        this.spawnDistance = spawnDistance * spawnDistance;
+        this.actionDistance = actionDistance * actionDistance;
 
         Bukkit.getPluginManager().registerEvents(this, javaPlugin);
 
@@ -82,7 +82,7 @@ public void onPacketReceiving(PacketEvent event) {
 
                     Bukkit.getScheduler().runTask(javaPlugin, () ->
                             Bukkit.getPluginManager().callEvent(
-                                    new PlayerNPCInteractEvent(event.getPlayer(), npc, PlayerNPCInteractEvent.Action.fromProtocolLib(action))
+                                    new PlayerNPCInteractEvent(event.getPlayer(), npc, action)
                             ));
                 }
             }
@@ -95,7 +95,7 @@ private void npcTick() {
             for (Player player : ImmutableList.copyOf(Bukkit.getOnlinePlayers())) {
 
                 for (NPC npc : this.npcMap.values()) {
-                    double distance = npc.getLocation().distance(player.getLocation());
+                    double distance = npc.getLocation().distanceSquared(player.getLocation());
 
                     if (distance >= this.spawnDistance && npc.isShownFor(player)) {
                         npc.hide(player);
@@ -143,7 +143,7 @@ public void handleSneak(PlayerToggleSneakEvent event) {
         Player player = event.getPlayer();
 
         this.npcMap.values().stream()
-                .filter(npc -> npc.isImitatePlayer() && npc.isShownFor(player) && npc.getLocation().distance(player.getLocation()) <= this.actionDistance)
+                .filter(npc -> npc.isImitatePlayer() && npc.isShownFor(player) && npc.getLocation().distanceSquared(player.getLocation()) <= this.actionDistance)
                 .forEach(npc -> npc.metadata().queueSneaking(event.isSneaking()).send(player));
     }
 
@@ -153,7 +153,7 @@ public void handleClick(PlayerInteractEvent event) {
 
         if (event.getAction() == Action.LEFT_CLICK_AIR || event.getAction() == Action.LEFT_CLICK_BLOCK) {
             this.npcMap.values().stream()
-                    .filter(npc -> npc.isImitatePlayer() && npc.isShownFor(player) && npc.getLocation().distance(player.getLocation()) <= this.actionDistance)
+                    .filter(npc -> npc.isImitatePlayer() && npc.isShownFor(player) && npc.getLocation().distanceSquared(player.getLocation()) <= this.actionDistance)
                     .forEach(npc -> npc.animation().queue(AnimationModifier.EntityAnimation.SWING_MAIN_ARM).send(player));
         }
     }

src/main/java/com/github/juliarn/npc/event/PlayerNPCInteractEvent.java

@@ -12,11 +12,11 @@ public class PlayerNPCInteractEvent extends PlayerEvent {
 
     private static final HandlerList HANDLER_LIST = new HandlerList();
 
-    private NPC npc;
+    private final NPC npc;
 
-    private Action action;
+    private final EnumWrappers.EntityUseAction action;
 
-    public PlayerNPCInteractEvent(@NotNull Player who, @NotNull NPC npc, @NotNull Action action) {
+    public PlayerNPCInteractEvent(@NotNull Player who, @NotNull NPC npc, @NotNull EnumWrappers.EntityUseAction action) {
         super(who);
         this.npc = npc;
         this.action = action;
@@ -33,7 +33,7 @@ public NPC getNPC() {
     }
 
     @NotNull
-    public Action getAction() {
+    public EnumWrappers.EntityUseAction getAction() {
         return action;
     }
 
@@ -43,14 +43,4 @@ public HandlerList getHandlers() {
         return HANDLER_LIST;
     }
 
-    public enum Action {
-        RIGHT_CLICKED,
-        LEFT_CLICKED;
-
-        public static Action fromProtocolLib(EnumWrappers.EntityUseAction protocolLibAction) {
-            return protocolLibAction == EnumWrappers.EntityUseAction.ATTACK ? LEFT_CLICKED : RIGHT_CLICKED;
-        }
-
-    }
-
 }

src/main/java/com/github/juliarn/npc/modifier/AnimationModifier.java

@@ -24,7 +24,7 @@ public enum EntityAnimation {
         CRITICAL_EFFECT(4),
         MAGIC_CRITICAL_EFFECT(5);
 
-        private int id;
+        private final int id;
 
         EntityAnimation(int id) {
             this.id = id;

src/main/java/com/github/juliarn/npc/modifier/MetadataModifier.java

@@ -14,7 +14,7 @@
 
 public class MetadataModifier extends NPCModifier {
 
-    private List<WrappedWatchableObject> metadata = new ArrayList<>();
+    private final List<WrappedWatchableObject> metadata = new ArrayList<>();
 
     public MetadataModifier(@NotNull NPC npc) {
         super(npc);

src/main/java/com/github/juliarn/npc/modifier/NPCModifier.java

@@ -22,7 +22,7 @@ public class NPCModifier {
 
     protected NPC npc;
 
-    private List<PacketContainer> packetContainers = new CopyOnWriteArrayList<>();
+    private final List<PacketContainer> packetContainers = new CopyOnWriteArrayList<>();
 
     public NPCModifier(@NotNull NPC npc) {
         this.npc = npc;