BETA: Updating to Trove 3.0.0.

L2J_Server_BETA/.classpath

@@ -15,6 +15,6 @@
 	<classpathentry kind="lib" path="lib/mmocore.jar" />
 	<classpathentry kind="lib" path="lib/netcon.jar" />
 	<classpathentry kind="lib" path="lib/smtp.jar" />
-	<classpathentry kind="lib" path="lib/trove-2.1.0.jar" />
+	<classpathentry kind="lib" path="lib/trove-3.0.0.jar" />
 	<classpathentry kind="output" path="bin" />
 </classpath>

L2J_Server_BETA/java/com/l2jserver/Config.java

@@ -14,10 +14,10 @@
  */
 package com.l2jserver;
 
-import gnu.trove.TIntArrayList;
-import gnu.trove.TIntFloatHashMap;
-import gnu.trove.TIntIntHashMap;
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.list.array.TIntArrayList;
+import gnu.trove.map.hash.TIntFloatHashMap;
+import gnu.trove.map.hash.TIntIntHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.io.BufferedReader;
 import java.io.File;

L2J_Server_BETA/java/com/l2jserver/gameserver/GameTimeController.java

@@ -14,8 +14,8 @@
  */
 package com.l2jserver.gameserver;
 
-import gnu.trove.TIntObjectHashMap;
-import gnu.trove.TObjectProcedure;
+import gnu.trove.map.hash.TIntObjectHashMap;
+import gnu.trove.procedure.TObjectProcedure;
 
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Level;

L2J_Server_BETA/java/com/l2jserver/gameserver/GeoEngine.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver;
 
-import gnu.trove.TShortObjectHashMap;
+import gnu.trove.map.hash.TShortObjectHashMap;
 
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;

L2J_Server_BETA/java/com/l2jserver/gameserver/SevenSigns.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver;
 
-import gnu.trove.TObjectProcedure;
+import gnu.trove.procedure.TObjectProcedure;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

L2J_Server_BETA/java/com/l2jserver/gameserver/SevenSignsFestival.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver;
 
-import gnu.trove.TObjectProcedure;
+import gnu.trove.procedure.TObjectProcedure;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

L2J_Server_BETA/java/com/l2jserver/gameserver/Shutdown.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver;
 
-import gnu.trove.TObjectProcedure;
+import gnu.trove.procedure.TObjectProcedure;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;

L2J_Server_BETA/java/com/l2jserver/gameserver/cache/HtmCache.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.cache;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.io.BufferedInputStream;
 import java.io.File;

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/AccessLevels.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.datatables;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/ArmorSetsTable.java

@@ -19,7 +19,7 @@
 
 package com.l2jserver.gameserver.datatables;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/AugmentationData.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.datatables;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.io.File;
 import java.util.ArrayList;

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/CharSummonTable.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.datatables;
 
-import gnu.trove.TIntIntHashMap;
+import gnu.trove.map.hash.TIntIntHashMap;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/DoorTable.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.datatables;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -268,7 +268,7 @@ public class DoorTable
 	
 	public L2DoorInstance[] getDoors()
 	{
-		L2DoorInstance[] _allTemplates = _staticItems.getValues(new L2DoorInstance[_staticItems.size()]);
+		L2DoorInstance[] _allTemplates = _staticItems.values(new L2DoorInstance[_staticItems.size()]);
 		return _allTemplates;
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/EnchantGroupsTable.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.datatables;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/EnchantHPBonusData.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.datatables;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.io.File;
 import java.util.Collection;

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/HennaTable.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.datatables;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/HerbDropTable.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.datatables;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/LevelUpData.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.datatables;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/MultiSell.java

@@ -14,8 +14,8 @@
  */
 package com.l2jserver.gameserver.datatables;
 
-import gnu.trove.TIntObjectHashMap;
-import gnu.trove.TIntObjectIterator;
+import gnu.trove.iterator.TIntObjectIterator;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.io.File;
 import java.util.List;

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/NpcBufferTable.java

@@ -12,8 +12,8 @@
  */
 package com.l2jserver.gameserver.datatables;
 
-import gnu.trove.TIntIntHashMap;
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntIntHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/NpcTable.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.datatables;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -738,7 +738,7 @@ public class NpcTable
 			// restore additional data from saved copy
 			L2NpcTemplate created = getTemplate(id);
 			
-			for (L2Skill skill : skills.getValues(new L2Skill[skills.size()]))
+			for (L2Skill skill : skills.values(new L2Skill[skills.size()]))
 				created.addSkill(skill);
 			
 			if (classIds != null)
@@ -847,7 +847,7 @@ public class NpcTable
 	
 	public L2NpcTemplate getTemplateByName(String name)
 	{
-		for (Object npcTemplate : _npcs.getValues())
+		for (Object npcTemplate : _npcs.values())
 			if (((L2NpcTemplate)npcTemplate).name.equalsIgnoreCase(name))
 				return (L2NpcTemplate) npcTemplate;
 		
@@ -858,7 +858,7 @@ public class NpcTable
 	{
 		List<L2NpcTemplate> list = new FastList<L2NpcTemplate>();
 		
-		for (Object t : _npcs.getValues())
+		for (Object t : _npcs.values())
 			if (((L2NpcTemplate)t).level == lvl)
 				list.add((L2NpcTemplate) t);
 		
@@ -869,7 +869,7 @@ public class NpcTable
 	{
 		List<L2NpcTemplate> list = new FastList<L2NpcTemplate>();
 		
-		for (Object t : _npcs.getValues())
+		for (Object t : _npcs.values())
 			if (((L2NpcTemplate)t).level == lvl && "L2Monster".equals(((L2NpcTemplate)t).type))
 				list.add((L2NpcTemplate) t);
 		
@@ -880,7 +880,7 @@ public class NpcTable
 	{
 		List<L2NpcTemplate> list = new FastList<L2NpcTemplate>();
 		
-		for (Object t : _npcs.getValues())
+		for (Object t : _npcs.values())
 			if (((L2NpcTemplate)t).name.startsWith(letter) && "L2Npc".equals(((L2NpcTemplate)t).type))
 				list.add((L2NpcTemplate) t);
 		
@@ -895,7 +895,7 @@ public class NpcTable
 	{
 		List<L2NpcTemplate> list = new FastList<L2NpcTemplate>();
 		
-		for (Object t : _npcs.getValues())
+		for (Object t : _npcs.values())
 			if (classType.equals(((L2NpcTemplate)t).type))
 				list.add((L2NpcTemplate) t);
 		

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/NpcWalkerRoutesTable.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.datatables;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -137,7 +137,7 @@ public class NpcWalkerRoutesTable
 			}
 		}
 		
-		for (Object list : _routes.getValues())
+		for (Object list : _routes.values())
 			((ArrayList<?>)list).trimToSize();
 		
 		_log.info("WalkerRoutesTable: Loaded " + _routes.size() + " Npc Walker Routes.");

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/PetDataTable.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.datatables;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.io.File;
 import java.util.logging.Level;

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SkillTable.java

@@ -12,11 +12,11 @@
  */
 package com.l2jserver.gameserver.datatables;
 
-import java.util.logging.Logger;
+import gnu.trove.list.array.TIntArrayList;
+import gnu.trove.map.hash.TIntIntHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
-import gnu.trove.TIntArrayList;
-import gnu.trove.TIntIntHashMap;
-import gnu.trove.TIntObjectHashMap;
+import java.util.logging.Logger;
 
 import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.skills.SkillsEngine;
@@ -58,7 +58,7 @@ public class SkillTable
 		SkillsEngine.getInstance().loadAllSkills(_skills);
 		
 		_skillMaxLevel.clear();
-		for (final L2Skill skill : _skills.getValues(new L2Skill[_skills.size()]))
+		for (final L2Skill skill : _skills.values(new L2Skill[_skills.size()]))
 		{
 			final int skillId = skill.getId();
 			final int skillLvl = skill.getLevel();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SkillTreesData.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.datatables;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.io.File;
 import java.util.Arrays;

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/StaticObjects.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.datatables;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.io.BufferedReader;
 import java.io.File;

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SummonEffectsTable.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.datatables;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.util.List;
 

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SummonItemsData.java

@@ -21,7 +21,7 @@
 
 package com.l2jserver.gameserver.datatables;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.io.File;
 import java.util.Scanner;
@@ -112,7 +112,7 @@ public class SummonItemsData
 		int size = _summonitems.size();
 		int[] result = new int[size];
 		int i = 0;
-		for (Object si : _summonitems.getValues())
+		for (Object si : _summonitems.values())
 		{
 			result[i++] = ((L2SummonItem) si).getItemId();
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/TeleportLocationTable.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.datatables;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/AdminCommandHandler.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.handler;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.util.logging.Logger;
 

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/BypassHandler.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.handler;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/ChatHandler.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.handler;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.util.logging.Logger;
 

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/ItemHandler.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.handler;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import com.l2jserver.gameserver.templates.item.L2EtcItem;
 

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/SkillHandler.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.handler;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import com.l2jserver.gameserver.templates.skills.L2SkillType;
 

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/UserCommandHandler.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.handler;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.util.logging.Logger;
 

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/VoicedCommandHandler.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.handler;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.util.logging.Logger;
 

L2J_Server_BETA/java/com/l2jserver/gameserver/idfactory/IdFactory.java

@@ -12,7 +12,7 @@
  */
 package com.l2jserver.gameserver.idfactory;
 
-import gnu.trove.TIntArrayList;
+import gnu.trove.list.array.TIntArrayList;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -381,7 +381,7 @@ public abstract class IdFactory
 			
 			temp.sort();
 			
-			return temp.toNativeArray();
+			return temp.toArray();
 		}
 		finally
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/AirShipManager.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.instancemanager;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/AntiFeedManager.java

@@ -14,8 +14,8 @@
  */
 package com.l2jserver.gameserver.instancemanager;
 
-import gnu.trove.TIntObjectHashMap;
-import gnu.trove.TObjectProcedure;
+import gnu.trove.map.hash.TIntObjectHashMap;
+import gnu.trove.procedure.TObjectProcedure;
 
 import java.util.Map;
 

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/BoatManager.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.instancemanager;
 
-import gnu.trove.TObjectProcedure;
+import gnu.trove.procedure.TObjectProcedure;
 
 import java.util.Map;
 

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/DimensionalRiftManager.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.instancemanager;
 
-import gnu.trove.TByteObjectHashMap;
+import gnu.trove.map.hash.TByteObjectHashMap;
 
 import java.awt.Polygon;
 import java.awt.Shape;
@@ -540,7 +540,7 @@ public class DimensionalRiftManager
 	public boolean isAllowedEnter(byte type)
 	{
 		int count = 0;
-		for (Object room : _rooms.get(type).getValues())
+		for (Object room : _rooms.get(type).values())
 		{
 			if (((DimensionalRiftRoom) room).ispartyInside())
 				count++;
@@ -551,7 +551,7 @@ public class DimensionalRiftManager
 	public FastList<Byte> getFreeRooms(byte type)
 	{
 		FastList<Byte> list = new FastList<Byte>();
-		for (Object room : _rooms.get(type).getValues())
+		for (Object room : _rooms.get(type).values())
 		{
 			if (!((DimensionalRiftRoom) room).ispartyInside())
 				list.add(((DimensionalRiftRoom) room)._room);

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/FourSepulchersManager.java

@@ -14,8 +14,8 @@
  */
 package com.l2jserver.gameserver.instancemanager;
 
-import gnu.trove.TIntIntHashMap;
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntIntHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -1426,7 +1426,7 @@ public class FourSepulchersManager
 	
 	protected void closeAllDoors()
 	{
-		for (int doorId : _hallGateKeepers.getValues())
+		for (int doorId : _hallGateKeepers.values())
 		{
 			try
 			{

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/GrandBossManager.java

@@ -14,8 +14,8 @@
  */
 package com.l2jserver.gameserver.instancemanager;
 
-import gnu.trove.TIntIntHashMap;
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntIntHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/HandysBlockCheckerManager.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.instancemanager;
 
-import gnu.trove.TIntIntHashMap;
+import gnu.trove.map.hash.TIntIntHashMap;
 
 import java.util.ArrayList;
 import java.util.List;

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/ItemAuctionManager.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.instancemanager;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.io.File;
 import java.sql.Connection;
@@ -127,7 +127,7 @@ public final class ItemAuctionManager
 	
 	public final void shutdown()
 	{
-		final ItemAuctionInstance[] instances = _managerInstances.getValues(new ItemAuctionInstance[_managerInstances.size()]);
+		final ItemAuctionInstance[] instances = _managerInstances.values(new ItemAuctionInstance[_managerInstances.size()]);
 		for (final ItemAuctionInstance instance : instances)
 		{
 			instance.shutdown();

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/MailManager.java

@@ -104,7 +104,7 @@ public class MailManager
 	
 	public final Message[] getMessages()
 	{
-		return _messages.getValues(new Message[_messages.size()]);
+		return _messages.values(new Message[_messages.size()]);
 	}
 	
 	public final boolean hasUnreadPost(L2PcInstance player)

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/SiegeManager.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.instancemanager;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.io.File;
 import java.io.FileInputStream;

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/TransformationManager.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.instancemanager;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.util.logging.Logger;
 

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/ZoneManager.java

@@ -15,7 +15,7 @@
 
 package com.l2jserver.gameserver.instancemanager;
 
-import gnu.trove.TObjectProcedure;
+import gnu.trove.procedure.TObjectProcedure;
 
 import java.io.File;
 import java.lang.reflect.Constructor;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/Elementals.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.model;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2EnchantSkillLearn.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.model;
 
-import gnu.trove.TIntIntHashMap;
+import gnu.trove.map.hash.TIntIntHashMap;
 
 import com.l2jserver.gameserver.datatables.EnchantGroupsTable;
 import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillDetail;
@@ -73,7 +73,7 @@ public final class L2EnchantSkillLearn
 	
 	public L2EnchantSkillGroup getFirstRouteGroup()
 	{
-		return EnchantGroupsTable.getInstance().getEnchantSkillGroupById(_enchantRoutes.getValues()[0]);
+		return EnchantGroupsTable.getInstance().getEnchantSkillGroupById(_enchantRoutes.values()[0]);
 	}
 	
 	public int[] getAllRoutes()

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Manor.java

@@ -53,7 +53,7 @@ public class L2Manor
 	
 	public SeedData[] getSeedsDataArray()
 	{
-		return _seeds.getValues(new SeedData[_seeds.size()]);
+		return _seeds.values(new SeedData[_seeds.size()]);
 	}
 	
 	public FastList<Integer> getAllCrops()

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2PetData.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.model;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.util.ArrayList;
 import java.util.List;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2World.java

@@ -14,8 +14,8 @@
  */
 package com.l2jserver.gameserver.model;
 
-import gnu.trove.TIntObjectHashMap;
-import gnu.trove.TObjectProcedure;
+import gnu.trove.map.hash.TIntObjectHashMap;
+import gnu.trove.procedure.TObjectProcedure;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -214,7 +214,7 @@ public final class L2World
 	
 	public final L2Object[] getAllVisibleObjectsArray()
 	{
-		return _allObjects.getValues(new L2Object[_allObjects.size()]);
+		return _allObjects.values(new L2Object[_allObjects.size()]);
 	}
 	
 	public final boolean forEachObject(final TObjectProcedure<L2Object> proc)
@@ -247,7 +247,7 @@ public final class L2World
 	
 	public final L2PcInstance[] getAllPlayersArray()
 	{
-		return _allPlayers.getValues(new L2PcInstance[_allPlayers.size()]);
+		return _allPlayers.values(new L2PcInstance[_allPlayers.size()]);
 	}
 	
 	public final boolean forEachPlayer(final TObjectProcedure<L2PcInstance> proc)

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -6082,7 +6082,7 @@ public abstract class L2Character extends L2Object
 		if (_skills == null)
 			return new L2Skill[0];
 		
-		return _skills.getValues(new L2Skill[_skills.size()]);
+		return _skills.values(new L2Skill[_skills.size()]);
 	}
 	
 	public ChanceSkillList getChanceSkills()

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2CastleTeleporterInstance.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
-import gnu.trove.TObjectProcedure;
+import gnu.trove.procedure.TObjectProcedure;
 
 import java.util.StringTokenizer;
 import java.util.logging.Level;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2NpcBufferInstance.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
-import gnu.trove.TIntIntHashMap;
+import gnu.trove.map.hash.TIntIntHashMap;
 
 import java.util.logging.Logger;
 

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
-import gnu.trove.TIntArrayList;
+import gnu.trove.list.array.TIntArrayList;
 
 import java.sql.Connection;
 import java.sql.Date;
@@ -5556,7 +5556,7 @@ public final class L2PcInstance extends L2Playable
 		// Unsummon Cubics
 		if (!_cubics.isEmpty())
 		{
-			for (L2CubicInstance cubic : _cubics.getValues(new L2CubicInstance[_cubics.size()]))
+			for (L2CubicInstance cubic : _cubics.values(new L2CubicInstance[_cubics.size()]))
 			{
 				cubic.stopAction();
 				cubic.cancelDisappear();
@@ -9573,7 +9573,7 @@ public final class L2PcInstance extends L2Playable
 		if (getCubics() != null)
 		{
 			boolean removed = false;
-			for (L2CubicInstance cubic : _cubics.getValues(new L2CubicInstance[_cubics.size()]))
+			for (L2CubicInstance cubic : _cubics.values(new L2CubicInstance[_cubics.size()]))
 			{
 				cubic.stopAction();
 				delCubic(cubic.getId());
@@ -9589,7 +9589,7 @@ public final class L2PcInstance extends L2Playable
 		if (getCubics() != null)
 		{
 			boolean removed = false;
-			for (L2CubicInstance cubic : _cubics.getValues(new L2CubicInstance[_cubics.size()]))
+			for (L2CubicInstance cubic : _cubics.values(new L2CubicInstance[_cubics.size()]))
 			{
 				if (cubic.givenByOther())
 				{
@@ -10077,7 +10077,7 @@ public final class L2PcInstance extends L2Playable
 		
 		if (!getCubics().isEmpty())
 		{
-			for (L2CubicInstance cubic : _cubics.getValues(new L2CubicInstance[_cubics.size()]))
+			for (L2CubicInstance cubic : _cubics.values(new L2CubicInstance[_cubics.size()]))
 			{
 				cubic.stopAction();
 				cubic.cancelDisappear();
@@ -13150,7 +13150,7 @@ public final class L2PcInstance extends L2Playable
 	
 	public TimeStamp[] getReuseTimeStamps()
 	{
-		return _reuseTimeStamps.getValues(new TimeStamp[_reuseTimeStamps.size()]);
+		return _reuseTimeStamps.values(new TimeStamp[_reuseTimeStamps.size()]);
 	}
 	
 	public L2TIntObjectHashMap<TimeStamp> getReuseTimeStamp()

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherNpcInstance.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
-import gnu.trove.TObjectProcedure;
+import gnu.trove.procedure.TObjectProcedure;
 
 import java.util.concurrent.Future;
 

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SummonInstance.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.model.actor.instance;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Castle.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.model.entity;
 
-import gnu.trove.TIntIntHashMap;
+import gnu.trove.map.hash.TIntIntHashMap;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Fort.java

@@ -14,8 +14,8 @@
  */
 package com.l2jserver.gameserver.model.entity;
 
-import gnu.trove.TIntIntHashMap;
-import gnu.trove.TObjectProcedure;
+import gnu.trove.map.hash.TIntIntHashMap;
+import gnu.trove.procedure.TObjectProcedure;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Instance.java

@@ -1,7 +1,7 @@
 package com.l2jserver.gameserver.model.entity;
 
-import gnu.trove.TIntHashSet;
-import gnu.trove.TIntProcedure;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.set.hash.TIntHashSet;
 
 import java.io.File;
 import java.io.IOException;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java

@@ -420,7 +420,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable
 		}
 		
 		// Update pvp flag for winners when siege zone becomes unactive
-		for(Object obj : _hall.getSiegeZone().getCharactersInside().getValues())
+		for(Object obj : _hall.getSiegeZone().getCharactersInside().values())
 			if(obj != null && obj instanceof L2PcInstance)
 				((L2PcInstance)obj).startPvPFlag();
 		

L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemauction/ItemAuctionInstance.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.model.itemauction;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -212,7 +212,7 @@ public final class ItemAuctionInstance
 	
 	final void checkAndSetCurrentAndNextAuction()
 	{
-		final ItemAuction[] auctions = _auctions.getValues(new ItemAuction[_auctions.size()]);
+		final ItemAuction[] auctions = _auctions.values(new ItemAuction[_auctions.size()]);
 		
 		ItemAuction currentAuction = null;
 		ItemAuction nextAuction = null;
@@ -354,7 +354,7 @@ public final class ItemAuctionInstance
 		
 		synchronized (_auctions)
 		{
-			auctions = _auctions.getValues(new ItemAuction[_auctions.size()]);
+			auctions = _auctions.values(new ItemAuction[_auctions.size()]);
 		}
 		
 		return auctions;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/olympiad/Olympiad.java

@@ -19,7 +19,7 @@
 
 package com.l2jserver.gameserver.model.olympiad;
 
-import gnu.trove.TIntIntHashMap;
+import gnu.trove.map.hash.TIntIntHashMap;
 
 import java.io.File;
 import java.io.FileInputStream;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/L2ZoneType.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.model.zone;
 
-import gnu.trove.TObjectProcedure;
+import gnu.trove.procedure.TObjectProcedure;
 
 import java.util.Map;
 import java.util.logging.Logger;
@@ -467,7 +467,7 @@ public abstract class L2ZoneType
 	
 	public L2Character[] getCharactersInsideArray()
 	{
-		return _characterList.getValues(new L2Character[_characterList.size()]);
+		return _characterList.values(new L2Character[_characterList.size()]);
 	}
 	
 	public void addQuestEvent(Quest.QuestEventType EventType, Quest q)

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/AbstractEnchantPacket.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.network.clientpackets;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.util.Arrays;
 

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestStartPledgeWar.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.network.clientpackets;
 
-import gnu.trove.TObjectProcedure;
+import gnu.trove.procedure.TObjectProcedure;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.datatables.ClanTable;

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestStopPledgeWar.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.network.clientpackets;
 
-import gnu.trove.TObjectProcedure;
+import gnu.trove.procedure.TObjectProcedure;
 
 import com.l2jserver.gameserver.datatables.ClanTable;
 import com.l2jserver.gameserver.model.L2Clan;

L2J_Server_BETA/java/com/l2jserver/gameserver/skills/SkillsEngine.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.skills;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.io.File;
 import java.util.List;

L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillSummon.java

@@ -166,8 +166,8 @@ public class L2SkillSummon extends L2Skill
 						mastery = 0;
 					if (mastery == 0 && !player.getCubics().isEmpty())
 					{
-						// Player can have only 1 cubic - we shuld replace old cubic with new one
-						for (L2CubicInstance c: player.getCubics().getValues(new L2CubicInstance[player.getCubics().size()]))
+						// Player can have only 1 cubic - we should replace old cubic with new one
+						for (L2CubicInstance c: player.getCubics().values(new L2CubicInstance[player.getCubics().size()]))
 						{
 							c.stopAction();
 							c = null;

L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/AttackStanceTaskManager.java

@@ -64,7 +64,7 @@ public class AttackStanceTaskManager
 		if (actor instanceof L2PcInstance)
 		{
 			L2PcInstance player = (L2PcInstance) actor;
-			for (L2CubicInstance cubic : player.getCubics().getValues(new L2CubicInstance[player.getCubics().size()]))
+			for (L2CubicInstance cubic : player.getCubics().values(new L2CubicInstance[player.getCubics().size()]))
 				if (cubic.getId() != L2CubicInstance.LIFE_CUBIC)
 					cubic.doAction();
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/templates/chars/L2NpcTemplate.java

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.templates.chars;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.util.List;
 import java.util.Map;
@@ -464,7 +464,7 @@ public final class L2NpcTemplate extends L2CharTemplate
 	
 	public L2Skill[] getSkillsArray()
 	{
-		return _skills.getValues(new L2Skill[_skills.size()]);
+		return _skills.values(new L2Skill[_skills.size()]);
 	}
 	
 	public void addQuestEvent(Quest.QuestEventType EventType, Quest q)

L2J_Server_BETA/java/com/l2jserver/gameserver/util/Broadcast.java

@@ -24,7 +24,7 @@
  */
 package com.l2jserver.gameserver.util;
 
-import gnu.trove.TObjectProcedure;
+import gnu.trove.procedure.TObjectProcedure;
 
 import java.util.Collection;
 import java.util.logging.Level;

L2J_Server_BETA/java/com/l2jserver/gameserver/util/L2TIntObjectHashMap.java

@@ -14,17 +14,17 @@
  */
 package com.l2jserver.gameserver.util;
 
-import gnu.trove.TIntObjectHashMap;
-import gnu.trove.TIntObjectProcedure;
-import gnu.trove.TIntProcedure;
-import gnu.trove.TObjectFunction;
-import gnu.trove.TObjectProcedure;
+import gnu.trove.function.TObjectFunction;
+import gnu.trove.map.hash.TIntObjectHashMap;
+import gnu.trove.procedure.TIntObjectProcedure;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.procedure.TObjectProcedure;
 
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 /**
- * Custom extension of TIntObjectHashMap that is synchronised via
+ * Custom extension of TIntObjectHashMap that is synchronized via
  * ReentrantReadWriteLock.
  * The purpose of this map is to replace the use of FastMap<K,V>.shared() which
  * requires a lot of resources.
@@ -152,12 +152,12 @@ public class L2TIntObjectHashMap<V extends Object> extends TIntObjectHashMap<V>
 	}
 	
 	@Override
-	public Object[] getValues()
+	public V[] values()
 	{
 		_readLock.lock();
 		try
 		{
-			return super.getValues();
+			return super.values();
 		}
 		finally
 		{
@@ -166,12 +166,12 @@ public class L2TIntObjectHashMap<V extends Object> extends TIntObjectHashMap<V>
 	}
 	
 	@Override
-	public <T> T[] getValues(T[] arg0)
+	public V[] values(V[] arg0)
 	{
 		_readLock.lock();
 		try
 		{
-			return super.getValues(arg0);
+			return super.values(arg0);
 		}
 		finally
 		{
@@ -222,7 +222,7 @@ public class L2TIntObjectHashMap<V extends Object> extends TIntObjectHashMap<V>
 	}
 	
 	@Override
-	public boolean containsValue(V arg0)
+	public boolean containsValue(Object arg0)
 	{
 		_readLock.lock();
 		try
@@ -288,7 +288,7 @@ public class L2TIntObjectHashMap<V extends Object> extends TIntObjectHashMap<V>
 	}
 	
 	@Override
-	public boolean forEachValue(TObjectProcedure<V> arg0)
+	public boolean forEachValue(TObjectProcedure<? super V> arg0)
 	{
 		_readLock.lock();
 		try
@@ -326,7 +326,7 @@ public class L2TIntObjectHashMap<V extends Object> extends TIntObjectHashMap<V>
 	}
 	
 	@Override
-	public boolean forEachEntry(TIntObjectProcedure<V> arg0)
+	public boolean forEachEntry(TIntObjectProcedure<? super V> arg0)
 	{
 		_readLock.lock();
 		try
@@ -364,7 +364,7 @@ public class L2TIntObjectHashMap<V extends Object> extends TIntObjectHashMap<V>
 	}
 	
 	@Override
-	public boolean retainEntries(TIntObjectProcedure<V> arg0)
+	public boolean retainEntries(TIntObjectProcedure<? super V> arg0)
 	{
 		_writeLock.lock();
 		try