Browse Source

BETA: Updating to Trove 3.0.0 Datapack part.
'''Note:''' Require [L4972].

Zoey76 13 years ago
parent
commit
734d8a79a5
18 changed files with 29 additions and 29 deletions
  1. 1 1
      L2J_DataPack_BETA/.classpath
  2. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java
  3. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/SummonMinions.java
  4. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Antharas.java
  5. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Ranku.java
  6. 3 3
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/BanditStrongHold/BanditStrongHold.java
  7. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/DevastatedCastle/DevastatedCastle.java
  8. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java
  9. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java
  10. 4 4
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
  11. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java
  12. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java
  13. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditNpc.java
  14. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TullyWorkshop/TullyWorkshop.java
  15. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
  16. 5 5
      L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java
  17. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q511_AwlUnderFoot/Q511_AwlUnderFoot.java
  18. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q692_HowtoOpposeEvil/Q692_HowtoOpposeEvil.java

+ 1 - 1
L2J_DataPack_BETA/.classpath

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

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java

@@ -14,7 +14,7 @@
  */
 package ai.group_template;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.model.actor.L2Attackable;

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/SummonMinions.java

@@ -14,8 +14,8 @@
  */
 package ai.group_template;
 
-import gnu.trove.TIntHashSet;
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
+import gnu.trove.set.hash.TIntHashSet;
 import javolution.util.FastList;
 import javolution.util.FastMap;
 

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Antharas.java

@@ -14,7 +14,7 @@
  */
 package ai.individual;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.util.List;
 import java.util.concurrent.ScheduledFuture;

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Ranku.java

@@ -14,7 +14,7 @@
  */
 package ai.individual;
 
-import gnu.trove.TIntHashSet;
+import gnu.trove.set.hash.TIntHashSet;
 import ai.group_template.L2AttackableAIScript;
 
 import com.l2jserver.gameserver.model.L2Skill;

+ 3 - 3
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/BanditStrongHold/BanditStrongHold.java

@@ -14,7 +14,7 @@
  */
 package conquerablehalls.BanditStrongHold;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -31,9 +31,9 @@ import com.l2jserver.gameserver.instancemanager.MapRegionManager.TeleportWhereTy
 import com.l2jserver.gameserver.model.L2CharPosition;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2SiegeClan;
+import com.l2jserver.gameserver.model.L2SiegeClan.SiegeClanType;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.L2World;
-import com.l2jserver.gameserver.model.L2SiegeClan.SiegeClanType;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.clanhall.ClanHallSiegeEngine;
@@ -326,7 +326,7 @@ public final class BanditStrongHold extends ClanHallSiegeEngine
 	@Override
 	public void onSiegeStarts()
 	{
-		for(Object obj : _data.getValues())
+		for(Object obj : _data.values())
 		{
 			try
 			{

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/DevastatedCastle/DevastatedCastle.java

@@ -14,7 +14,7 @@
  */
 package conquerablehalls.DevastatedCastle;
 
-import gnu.trove.TIntIntHashMap;
+import gnu.trove.map.hash.TIntIntHashMap;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.datatables.ClanTable;

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java

@@ -14,7 +14,7 @@
  */
 package conquerablehalls.FortressOfResistance;
 
-import gnu.trove.TIntLongHashMap;
+import gnu.trove.map.hash.TIntLongHashMap;
 
 import com.l2jserver.gameserver.cache.HtmCache;
 import com.l2jserver.gameserver.datatables.ClanTable;

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java

@@ -14,7 +14,7 @@
  */
 package conquerablehalls.FortressOfTheDead;
 
-import gnu.trove.TIntIntHashMap;
+import gnu.trove.map.hash.TIntIntHashMap;
 
 import com.l2jserver.gameserver.GameTimeController;
 import com.l2jserver.gameserver.ThreadPoolManager;

+ 4 - 4
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java

@@ -14,7 +14,7 @@
  */
 package conquerablehalls.RainbowSpringsChateau;
 
-import gnu.trove.TIntLongHashMap;
+import gnu.trove.map.hash.TIntLongHashMap;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -60,7 +60,7 @@ import com.l2jserver.util.Rnd;
 
 /**
  * @author BiggBoss
- * Rainbow Springs Cheateau clan hall siege script
+ * Rainbow Springs Chateau clan hall siege script
  */
 public class RainbowSpringsChateau extends Quest
 {
@@ -176,7 +176,7 @@ public class RainbowSpringsChateau extends Quest
 			for(int arenaId : ARENA_ZONES)
 			{
 				L2ZoneType zone = ZoneManager.getInstance().getZoneById(arenaId);
-				for(L2Character cha : (L2Character[])zone.getCharactersInside().getValues())
+				for(L2Character cha : (L2Character[])zone.getCharactersInside().values())
 					cha.teleToLocation(TeleportWhereType.Town);
 			}
 		}
@@ -638,7 +638,7 @@ public class RainbowSpringsChateau extends Quest
 			if(id == myArena)
 				continue;
 			
-			for(L2Character plr : (L2Character[])ZoneManager.getInstance().getZoneById(id).getCharactersInside().getValues())
+			for(L2Character plr : (L2Character[])ZoneManager.getInstance().getZoneById(id).getCharactersInside().values())
 			{
 				for(L2Skill sk : DEBUFFS)
 					sk.getEffects(plr, plr);

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java

@@ -14,7 +14,7 @@
  */
 package custom.KetraOrcSupport;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.model.L2Skill;

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java

@@ -14,7 +14,7 @@
  */
 package custom.VarkaSilenosSupport;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.model.L2Skill;

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditNpc.java

@@ -14,8 +14,8 @@
  */
 package handlers.admincommandhandlers;
 
-import gnu.trove.TIntObjectHashMap;
-import gnu.trove.TIntObjectIterator;
+import gnu.trove.iterator.TIntObjectIterator;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TullyWorkshop/TullyWorkshop.java

@@ -14,7 +14,7 @@
  */
 package hellbound.TullyWorkshop;
 
-import gnu.trove.TIntHashSet;
+import gnu.trove.set.hash.TIntHashSet;
 
 import java.util.Arrays;
 import java.util.List;

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java

@@ -14,7 +14,7 @@
  */
 package instances.FinalEmperialTomb;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.io.File;
 import java.util.Calendar;

+ 5 - 5
L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java

@@ -14,7 +14,7 @@
  */
 package instances.SeedOfDestruction;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.io.File;
 import java.util.Calendar;
@@ -26,13 +26,13 @@ import java.util.logging.Level;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 
+import javolution.util.FastList;
+import javolution.util.FastMap;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.GeoData;
 import com.l2jserver.gameserver.ai.CtrlIntention;
@@ -41,11 +41,11 @@ import com.l2jserver.gameserver.instancemanager.InstanceManager;
 import com.l2jserver.gameserver.instancemanager.InstanceManager.InstanceWorld;
 import com.l2jserver.gameserver.model.L2CharPosition;
 import com.l2jserver.gameserver.model.L2CommandChannel;
+import com.l2jserver.gameserver.model.L2Object.InstanceType;
 import com.l2jserver.gameserver.model.L2Party;
 import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.L2Territory;
 import com.l2jserver.gameserver.model.L2World;
-import com.l2jserver.gameserver.model.L2Object.InstanceType;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q511_AwlUnderFoot/Q511_AwlUnderFoot.java

@@ -14,7 +14,7 @@
  */
 package quests.Q511_AwlUnderFoot;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.instancemanager.InstanceManager;

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q692_HowtoOpposeEvil/Q692_HowtoOpposeEvil.java

@@ -14,7 +14,7 @@
  */
 package quests.Q692_HowtoOpposeEvil;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.actor.L2Npc;