Deprecate ByIdArray and pull in trove for better NPC storage

pom.xml

@@ -63,6 +63,12 @@
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+		    <groupId>net.sf.trove4j</groupId>
+		    <artifactId>trove4j</artifactId>
+		    <version>3.0.3</version>
+		    <scope>compile</scope>
+		</dependency>
 		<dependency>
 			<groupId>net.milkbowl.vault</groupId>
 			<artifactId>Vault</artifactId>

src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java

@@ -1,5 +1,7 @@
 package net.citizensnpcs.npc;
 
+import gnu.trove.map.hash.TIntObjectHashMap;
+
 import java.util.Iterator;
 
 import net.citizensnpcs.api.event.DespawnReason;
@@ -9,7 +11,6 @@
 import net.citizensnpcs.api.npc.NPCRegistry;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.npc.ai.NPCHolder;
-import net.citizensnpcs.util.ByIdArray;
 import net.citizensnpcs.util.NMS;
 
 import org.bukkit.Bukkit;
@@ -20,7 +21,7 @@
 import com.google.common.base.Preconditions;
 
 public class CitizensNPCRegistry implements NPCRegistry {
-    private final ByIdArray<NPC> npcs = new ByIdArray<NPC>();
+    private final TIntObjectHashMap<NPC> npcs = new TIntObjectHashMap<NPC>();
     private final NPCDataStore saves;
 
     public CitizensNPCRegistry(NPCDataStore store) {
@@ -103,6 +104,6 @@ public boolean isNPC(Entity entity) {
 
     @Override
     public Iterator<NPC> iterator() {
-        return npcs.iterator();
+        return npcs.valueCollection().iterator();
     }
 }

src/main/java/net/citizensnpcs/util/ByIdArray.java

@@ -5,6 +5,7 @@
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
+@Deprecated
 public class ByIdArray<T> implements Iterable<T> {
     private final int capacity;
     private Object[] elementData;