BETA: DP-Part for [L6440].

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/BeastFarm.java

@@ -28,7 +28,7 @@ import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.datatables.NpcData;
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.enums.QuestEventType;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.model.L2Object;
@@ -38,7 +38,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2TamedBeastInstance;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.serverpackets.AbstractNpcInfo;
 import com.l2jserver.gameserver.util.Util;
 
@@ -278,10 +278,10 @@ public class BeastFarm extends AbstractNpcAI
 			nextNpc.broadcastPacket(new AbstractNpcInfo.NpcInfo(nextNpc, player));
 			nextNpc.setRunning();
 			
-			SkillTable st = SkillTable.getInstance();
+			SkillData st = SkillData.getInstance();
 			for (SkillHolder sh : beast.getSkills())
 			{
-				nextNpc.addBeastSkill(st.getInfo(sh.getSkillId(), sh.getSkillLvl()));
+				nextNpc.addBeastSkill(st.getSkill(sh.getSkillId(), sh.getSkillLvl()));
 			}
 			
 			Q00020_BringUpWithLove.checkJewelOfInnocence(player);
@@ -303,7 +303,7 @@ public class BeastFarm extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onSkillSee(L2Npc npc, L2PcInstance caster, L2Skill skill, L2Object[] targets, boolean isSummon)
+	public String onSkillSee(L2Npc npc, L2PcInstance caster, Skill skill, L2Object[] targets, boolean isSummon)
 	{
 		// this behavior is only run when the target of skill is the passed npc (chest)
 		// i.e. when the player is attempting to open the chest using a skill

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Chimeras.java

@@ -27,7 +27,7 @@ import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 
 /**
  * Chimeras AI.
@@ -84,7 +84,7 @@ public class Chimeras extends AbstractNpcAI
 	}
 	
 	@Override
-	public final String onSkillSee(L2Npc npc, L2PcInstance caster, L2Skill skill, L2Object[] targets, boolean isSummon)
+	public final String onSkillSee(L2Npc npc, L2PcInstance caster, Skill skill, L2Object[] targets, boolean isSummon)
 	{
 		if ((skill.getId() == BOTTLE) && !npc.isDead())
 		{

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/DenOfEvil.java

@@ -21,14 +21,14 @@ package ai.group_template;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.ThreadPoolManager;
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.enums.QuestEventType;
 import com.l2jserver.gameserver.instancemanager.ZoneManager;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.zone.type.L2EffectZone;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
@@ -210,7 +210,7 @@ public class DenOfEvil extends AbstractNpcAI
 				}
 				if (character.isPlayable())
 				{
-					L2Skill skill = SkillTable.getInstance().getInfo(6149, 1);
+					Skill skill = SkillData.getInstance().getSkill(6149, 1);
 					skill.applyEffects(character, character);
 				}
 				else

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/EnergySeeds.java

@@ -42,7 +42,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
@@ -124,7 +124,7 @@ public class EnergySeeds extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onSkillSee(L2Npc npc, L2PcInstance caster, L2Skill skill, L2Object[] targets, boolean isSummon)
+	public String onSkillSee(L2Npc npc, L2PcInstance caster, Skill skill, L2Object[] targets, boolean isSummon)
 	{
 		if (!Util.contains(targets, npc) || (skill.getId() != 5780))
 		{

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FeedableBeasts.java

@@ -34,7 +34,7 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2TamedBeastInstance;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.serverpackets.NpcSay;
 import com.l2jserver.gameserver.util.Util;
@@ -500,7 +500,7 @@ public class FeedableBeasts extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onSkillSee(L2Npc npc, L2PcInstance caster, L2Skill skill, L2Object[] targets, boolean isSummon)
+	public String onSkillSee(L2Npc npc, L2PcInstance caster, Skill skill, L2Object[] targets, boolean isSummon)
 	{
 		// this behavior is only run when the target of skill is the passed npc (chest)
 		// i.e. when the player is attempting to open the chest using a skill

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FrozenLabyrinth.java

@@ -23,7 +23,7 @@ import ai.npc.AbstractNpcAI;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 
 /**
  * Frozen Labyrinth AI.
@@ -44,7 +44,7 @@ public final class FrozenLabyrinth extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, L2Skill skill)
+	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, Skill skill)
 	{
 		if (npc.isScriptValue(0) && (skill != null) && !skill.isMagic())
 		{

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/L2AttackableAIScript.java

@@ -37,7 +37,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2RiftInvaderInstance;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.quest.Quest;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.util.Util;
 
 /**
@@ -58,13 +58,13 @@ public final class L2AttackableAIScript extends Quest
 	}
 	
 	@Override
-	public String onSpellFinished(L2Npc npc, L2PcInstance player, L2Skill skill)
+	public String onSpellFinished(L2Npc npc, L2PcInstance player, Skill skill)
 	{
 		return null;
 	}
 	
 	@Override
-	public String onSkillSee(L2Npc npc, L2PcInstance caster, L2Skill skill, L2Object[] targets, boolean isSummon)
+	public String onSkillSee(L2Npc npc, L2PcInstance caster, Skill skill, L2Object[] targets, boolean isSummon)
 	{
 		if (caster == null)
 		{

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/MonasteryOfSilence.java

@@ -31,7 +31,7 @@ import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
 
@@ -273,7 +273,7 @@ public final class MonasteryOfSilence extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onSkillSee(L2Npc npc, L2PcInstance caster, L2Skill skill, L2Object[] targets, boolean isSummon)
+	public String onSkillSee(L2Npc npc, L2PcInstance caster, Skill skill, L2Object[] targets, boolean isSummon)
 	{
 		if (skill.hasEffectType(L2EffectType.AGGRESSION) && (targets.length != 0))
 		{

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PrimevalIsle.java

@@ -34,7 +34,7 @@ import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
 import com.l2jserver.gameserver.util.Util;
@@ -139,7 +139,7 @@ public final class PrimevalIsle extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onSpellFinished(L2Npc npc, L2PcInstance player, L2Skill skill)
+	public String onSpellFinished(L2Npc npc, L2PcInstance player, Skill skill)
 	{
 		if (skill.getId() == CREW_SKILL.getSkillId())
 		{

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PrisonGuards.java

@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
 
@@ -123,7 +123,7 @@ public final class PrisonGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onSkillSee(L2Npc npc, L2PcInstance caster, L2Skill skill, L2Object[] targets, boolean isSummon)
+	public String onSkillSee(L2Npc npc, L2PcInstance caster, Skill skill, L2Object[] targets, boolean isSummon)
 	{
 		if (!caster.isAffectedBySkill(TIMER))
 		{
@@ -134,7 +134,7 @@ public final class PrisonGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onSpellFinished(L2Npc npc, L2PcInstance player, L2Skill skill)
+	public String onSpellFinished(L2Npc npc, L2PcInstance player, Skill skill)
 	{
 		if ((skill == SILENCE.getSkill()) || (skill == STONE.getSkill()))
 		{

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/RangeGuard.java

@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.util.Util;
 
 /**
@@ -99,7 +99,7 @@ public final class RangeGuard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, L2Skill skill)
+	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, Skill skill)
 	{
 		final L2Playable playable = (isSummon) ? attacker.getSummon() : attacker;
 		final int longRangeGuardRate = npc.getTemplate().getParameters().getInt("LongRangeGuardRate");

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Remnants.java

@@ -23,7 +23,7 @@ import ai.npc.AbstractNpcAI;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 
 /**
  * Remnants AI.
@@ -58,7 +58,7 @@ public class Remnants extends AbstractNpcAI
 	}
 	
 	@Override
-	public final String onSkillSee(L2Npc npc, L2PcInstance caster, L2Skill skill, L2Object[] targets, boolean isSummon)
+	public final String onSkillSee(L2Npc npc, L2PcInstance caster, Skill skill, L2Object[] targets, boolean isSummon)
 	{
 		if (skill.getId() == SKILL_HOLY_WATER)
 		{

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Sandstorms.java

@@ -20,7 +20,7 @@ package ai.group_template;
 
 import ai.npc.AbstractNpcAI;
 
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
@@ -40,7 +40,7 @@ public class Sandstorms extends AbstractNpcAI
 	public String onAggroRangeEnter(L2Npc npc, L2PcInstance player, boolean isSummon)
 	{
 		npc.setTarget(player);
-		npc.doCast(SkillTable.getInstance().getInfo(5435, 1));
+		npc.doCast(SkillData.getInstance().getSkill(5435, 1));
 		return super.onAggroRangeEnter(npc, player, isSummon);
 	}
 	

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/SeedOfAnnihilation.java

@@ -24,7 +24,7 @@ import java.util.Map;
 import javolution.util.FastMap;
 import ai.npc.AbstractNpcAI;
 
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.datatables.SpawnTable;
 import com.l2jserver.gameserver.instancemanager.ZoneManager;
 import com.l2jserver.gameserver.model.L2Spawn;
@@ -351,8 +351,8 @@ public class SeedOfAnnihilation extends AbstractNpcAI
 			else
 			{
 				npc.setTarget(player);
-				npc.doCast(SkillTable.getInstance().getInfo(6408, 1));
-				npc.doCast(SkillTable.getInstance().getInfo(6649, 1));
+				npc.doCast(SkillData.getInstance().getSkill(6408, 1));
+				npc.doCast(SkillData.getInstance().getSkill(6649, 1));
 				npc.showChatWindow(player, 1);
 			}
 		}

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/SelMahumSquad.java

@@ -22,7 +22,7 @@ import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.GameTimeController;
 import com.l2jserver.gameserver.ai.CtrlIntention;
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.datatables.SpawnTable;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Spawn;
@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
 import com.l2jserver.gameserver.util.Util;
@@ -159,12 +159,12 @@ public final class SelMahumSquad extends AbstractNpcAI
 				
 				if (npc.isNoRndWalk()) // i_ai0 == 1
 				{
-					npc.doCast(SkillTable.getInstance().getInfo(6331, 1));
+					npc.doCast(SkillData.getInstance().getSkill(6331, 1));
 					npc.setDisplayEffect(MAHUM_EFFECT_SLEEP);
 				}
 				if (npc.getVariables().getInt("BUSY_STATE") == 1) // Eating - i_ai3 = 1
 				{
-					npc.doCast(SkillTable.getInstance().getInfo(6332, 1));
+					npc.doCast(SkillData.getInstance().getSkill(6332, 1));
 					npc.setDisplayEffect(MAHUM_EFFECT_EAT);
 				}
 				
@@ -201,7 +201,7 @@ public final class SelMahumSquad extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, L2Skill skill)
+	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, Skill skill)
 	{
 		if ((npc.getId() == CHEF) && (npc.getVariables().getInt("BUSY_STATE") == 0)) // i_ai2 == 0
 		{
@@ -344,11 +344,11 @@ public final class SelMahumSquad extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onSkillSee(L2Npc npc, L2PcInstance caster, L2Skill skill, L2Object[] targets, boolean isSummon)
+	public String onSkillSee(L2Npc npc, L2PcInstance caster, Skill skill, L2Object[] targets, boolean isSummon)
 	{
 		if ((npc.getId() == STOVE) && (skill.getId() == 9075) && Util.contains(targets, npc))
 		{
-			npc.doCast(SkillTable.getInstance().getInfo(6688, 1));
+			npc.doCast(SkillData.getInstance().getSkill(6688, 1));
 			npc.broadcastEvent("SCE_SOUP_FAILURE", 600, caster);
 		}
 		
@@ -380,7 +380,7 @@ public final class SelMahumSquad extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onSpellFinished(L2Npc npc, L2PcInstance player, L2Skill skill)
+	public String onSpellFinished(L2Npc npc, L2PcInstance player, Skill skill)
 	{
 		if ((skill != null) && (skill.getId() == 6330))
 		{
@@ -395,7 +395,7 @@ public final class SelMahumSquad extends AbstractNpcAI
 		if ((player != null) && !player.isDead() && (npc.getVariables().getInt("INVUL_REMOVE_TIMER_STARTED") != 1) && ((npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_ATTACK) || (npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_CAST)))
 		{
 			npc.setTarget(player);
-			npc.doCast(SkillTable.getInstance().getInfo(6330, 1));
+			npc.doCast(SkillData.getInstance().getSkill(6330, 1));
 		}
 		else
 		{

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/StakatoNest.java

@@ -23,13 +23,13 @@ import java.util.List;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 import com.l2jserver.gameserver.util.Broadcast;
 import com.l2jserver.gameserver.util.Util;
@@ -108,7 +108,7 @@ public class StakatoNest extends AbstractNpcAI
 					mob.abortAttack();
 					mob.abortCast();
 					mob.setHeading(Util.calculateHeadingFrom(mob, _follower));
-					mob.doCast(SkillTable.getInstance().getInfo(4484, 1));
+					mob.doCast(SkillData.getInstance().getSkill(4484, 1));
 					mob.setCurrentHp(mob.getCurrentHp() + _hp);
 					_follower.doDie(_follower);
 					_follower.deleteMe();
@@ -181,7 +181,7 @@ public class StakatoNest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onSkillSee(L2Npc npc, L2PcInstance caster, L2Skill skill, L2Object[] targets, boolean isSummon)
+	public String onSkillSee(L2Npc npc, L2PcInstance caster, Skill skill, L2Object[] targets, boolean isSummon)
 	{
 		if (Util.contains(COCOONS, npc.getId()) && Util.contains(targets, npc) && (skill.getId() == GROWTH_ACCELERATOR))
 		{

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/StarStones.java

@@ -23,7 +23,7 @@ import ai.npc.AbstractNpcAI;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
 /**
@@ -48,7 +48,7 @@ public class StarStones extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onSkillSee(L2Npc npc, L2PcInstance caster, L2Skill skill, L2Object[] targets, boolean isSummon)
+	public String onSkillSee(L2Npc npc, L2PcInstance caster, Skill skill, L2Object[] targets, boolean isSummon)
 	{
 		if (skill.getId() == 932)
 		{

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/SummonPc.java

@@ -24,7 +24,7 @@ import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 
 /**
  * Summon Pc AI.<br>
@@ -88,7 +88,7 @@ public final class SummonPc extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onSpellFinished(L2Npc npc, L2PcInstance player, L2Skill skill)
+	public String onSpellFinished(L2Npc npc, L2PcInstance player, Skill skill)
 	{
 		if ((skill.getId() == SUMMON_PC.getSkillId()) && !npc.isDead() && npc.getVariables().getBoolean("attacked", false))
 		{

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Amaskari.java

@@ -27,7 +27,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
 import com.l2jserver.gameserver.network.serverpackets.NpcSay;
@@ -101,7 +101,7 @@ public final class Amaskari extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, L2Skill skill)
+	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, Skill skill)
 	{
 		if ((npc.getId() == AMASKARI) && (getRandom(1000) < 25))
 		{

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Antharas/Antharas.java

@@ -38,7 +38,7 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2GrandBossInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.zone.type.L2NoRestartZone;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.serverpackets.Earthquake;
@@ -619,7 +619,7 @@ public final class Antharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, L2Skill skill)
+	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, Skill skill)
 	{
 		_lastAttack = System.currentTimeMillis();
 		
@@ -733,7 +733,7 @@ public final class Antharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onSpellFinished(L2Npc npc, L2PcInstance player, L2Skill skill)
+	public String onSpellFinished(L2Npc npc, L2PcInstance player, Skill skill)
 	{
 		if ((skill.getId() == ANTH_FEAR.getSkillId()) || (skill.getId() == ANTH_FEAR_SHORT.getSkillId()))
 		{

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Baium/Baium.java

@@ -35,7 +35,7 @@ import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2GrandBossInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.variables.NpcVariables;
 import com.l2jserver.gameserver.model.zone.type.L2NoRestartZone;
 import com.l2jserver.gameserver.network.NpcStringId;
@@ -482,7 +482,7 @@ public final class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, L2Skill skill)
+	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, Skill skill)
 	{
 		_lastAttack = System.currentTimeMillis();
 		
@@ -605,7 +605,7 @@ public final class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onSpellFinished(L2Npc npc, L2PcInstance player, L2Skill skill)
+	public String onSpellFinished(L2Npc npc, L2PcInstance player, Skill skill)
 	{
 		startQuestTimer("MANAGE_SKILLS", 1000, npc, null);
 		

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Ballista.java

@@ -25,7 +25,7 @@ import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
 /**
@@ -72,7 +72,7 @@ public final class Ballista extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onSkillSee(L2Npc npc, L2PcInstance caster, L2Skill skill, L2Object[] targets, boolean isSummon)
+	public String onSkillSee(L2Npc npc, L2PcInstance caster, Skill skill, L2Object[] targets, boolean isSummon)
 	{
 		if ((skill != null) && (caster.getTarget() == npc) && (getRandom(100) < 40) && (skill == BOMB.getSkill()))
 		{

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Beleth.java

@@ -43,7 +43,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
 import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
 import com.l2jserver.gameserver.network.serverpackets.DoorStatusUpdate;
@@ -468,7 +468,7 @@ public final class Beleth extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onSkillSee(L2Npc npc, L2PcInstance player, L2Skill skill, L2Object[] targets, boolean isSummon)
+	public String onSkillSee(L2Npc npc, L2PcInstance player, Skill skill, L2Object[] targets, boolean isSummon)
 	{
 		if ((npc != null) && !npc.isDead() && ((npc.getId() == 29118) || (npc.getId() == 29119)) && !npc.isCastingNow() && skill.hasEffectType(L2EffectType.HEAL) && (getRandom(100) < 80))
 		{
@@ -533,7 +533,7 @@ public final class Beleth extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onSpellFinished(L2Npc npc, L2PcInstance player, L2Skill skill)
+	public String onSpellFinished(L2Npc npc, L2PcInstance player, Skill skill)
 	{
 		if ((npc != null) && !npc.isDead() && ((npc.getId() == 29118) || (npc.getId() == 29119)) && !npc.isCastingNow())
 		{

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/DemonPrince.java

@@ -26,7 +26,7 @@ import ai.npc.AbstractNpcAI;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 
 /**
  * Demon Prince's AI.
@@ -66,7 +66,7 @@ public final class DemonPrince extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, L2Skill skill)
+	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, Skill skill)
 	{
 		if (!npc.isDead())
 		{

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Orfen.java

@@ -25,7 +25,7 @@ import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.ai.CtrlIntention;
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.instancemanager.GrandBossManager;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Spawn;
@@ -36,7 +36,7 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2GrandBossInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.zone.type.L2BossZone;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
@@ -241,7 +241,7 @@ public final class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onSkillSee(L2Npc npc, L2PcInstance caster, L2Skill skill, L2Object[] targets, boolean isSummon)
+	public String onSkillSee(L2Npc npc, L2PcInstance caster, Skill skill, L2Object[] targets, boolean isSummon)
 	{
 		if (npc.getId() == ORFEN)
 		{
@@ -253,7 +253,7 @@ public final class Orfen extends AbstractNpcAI
 				npc.broadcastPacket(packet);
 				originalCaster.teleToLocation(npc.getLocation());
 				npc.setTarget(originalCaster);
-				npc.doCast(SkillTable.getInstance().getInfo(4064, 1));
+				npc.doCast(SkillData.getInstance().getSkill(4064, 1));
 			}
 		}
 		return super.onSkillSee(npc, caster, skill, targets, isSummon);
@@ -271,7 +271,7 @@ public final class Orfen extends AbstractNpcAI
 		if ((npcId == RAIKEL_LEOS) && (getRandom(20) == 0))
 		{
 			npc.setTarget(attacker);
-			npc.doCast(SkillTable.getInstance().getInfo(4067, 4));
+			npc.doCast(SkillData.getInstance().getSkill(4067, 4));
 		}
 		else if (npcId == RIBA_IREN)
 		{
@@ -284,7 +284,7 @@ public final class Orfen extends AbstractNpcAI
 			{
 				npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE, null, null);
 				npc.setTarget(caller);
-				npc.doCast(SkillTable.getInstance().getInfo(4516, 1));
+				npc.doCast(SkillData.getInstance().getSkill(4516, 1));
 			}
 		}
 		return super.onFactionCall(npc, caller, attacker, isSummon);
@@ -308,7 +308,7 @@ public final class Orfen extends AbstractNpcAI
 				npc.broadcastPacket(packet);
 				attacker.teleToLocation(npc.getLocation());
 				npc.setTarget(attacker);
-				npc.doCast(SkillTable.getInstance().getInfo(4064, 1));
+				npc.doCast(SkillData.getInstance().getSkill(4064, 1));
 			}
 		}
 		else if (npcId == RIBA_IREN)
@@ -316,7 +316,7 @@ public final class Orfen extends AbstractNpcAI
 			if (!npc.isCastingNow() && ((npc.getCurrentHp() - damage) < (npc.getMaxHp() / 2.0)))
 			{
 				npc.setTarget(attacker);
-				npc.doCast(SkillTable.getInstance().getInfo(4516, 1));
+				npc.doCast(SkillData.getInstance().getSkill(4516, 1));
 			}
 		}
 		return super.onAttack(npc, attacker, damage, isSummon);

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java

@@ -25,7 +25,7 @@ import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.ai.CtrlIntention;
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.enums.QuestEventType;
 import com.l2jserver.gameserver.instancemanager.GrandBossManager;
 import com.l2jserver.gameserver.model.Location;
@@ -37,7 +37,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2GrandBossInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.zone.type.L2BossZone;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 import com.l2jserver.gameserver.network.serverpackets.PlaySound;
@@ -295,19 +295,19 @@ public final class QueenAnt extends AbstractNpcAI
 		
 		if (!Config.RAID_DISABLE_CURSE && ((character.getLevel() - npc.getLevel()) > 8))
 		{
-			L2Skill curse = null;
+			Skill curse = null;
 			if (isMage)
 			{
 				if (!character.isMuted() && (getRandom(4) == 0))
 				{
-					curse = SkillTable.FrequentSkill.RAID_CURSE.getSkill();
+					curse = SkillData.FrequentSkill.RAID_CURSE.getSkill();
 				}
 			}
 			else
 			{
 				if (!character.isParalyzed() && (getRandom(4) == 0))
 				{
-					curse = SkillTable.FrequentSkill.RAID_CURSE2.getSkill();
+					curse = SkillData.FrequentSkill.RAID_CURSE2.getSkill();
 				}
 			}
 			

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Ranku.java

@@ -26,7 +26,7 @@ import ai.npc.AbstractNpcAI;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
 import com.l2jserver.gameserver.network.serverpackets.NpcSay;
@@ -71,7 +71,7 @@ public final class Ranku extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, L2Skill skill)
+	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, Skill skill)
 	{
 		if (npc.getId() == RANKU)
 		{

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Valakas.java

@@ -26,7 +26,7 @@ import ai.npc.AbstractNpcAI;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.GeoData;
 import com.l2jserver.gameserver.ai.CtrlIntention;
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.enums.MountType;
 import com.l2jserver.gameserver.instancemanager.GrandBossManager;
 import com.l2jserver.gameserver.model.Location;
@@ -38,7 +38,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2GrandBossInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.zone.type.L2BossZone;
 import com.l2jserver.gameserver.network.serverpackets.PlaySound;
 import com.l2jserver.gameserver.network.serverpackets.SocialAction;
@@ -250,25 +250,25 @@ public final class Valakas extends AbstractNpcAI
 				if ((npc.getCurrentHp() < (npc.getMaxHp() / 4)) && (lvl != 4))
 				{
 					npc.setTarget(npc);
-					npc.doCast(SkillTable.getInstance().getInfo(VALAKAS_REGENERATION, 4));
+					npc.doCast(SkillData.getInstance().getSkill(VALAKAS_REGENERATION, 4));
 				}
 				// Current HPs are inferior to 50% ; apply lvl 3 of regen skill.
 				else if ((npc.getCurrentHp() < ((npc.getMaxHp() * 2) / 4.0)) && (lvl != 3))
 				{
 					npc.setTarget(npc);
-					npc.doCast(SkillTable.getInstance().getInfo(VALAKAS_REGENERATION, 3));
+					npc.doCast(SkillData.getInstance().getSkill(VALAKAS_REGENERATION, 3));
 				}
 				// Current HPs are inferior to 75% ; apply lvl 2 of regen skill.
 				else if ((npc.getCurrentHp() < ((npc.getMaxHp() * 3) / 4.0)) && (lvl != 2))
 				{
 					npc.setTarget(npc);
-					npc.doCast(SkillTable.getInstance().getInfo(VALAKAS_REGENERATION, 2));
+					npc.doCast(SkillData.getInstance().getSkill(VALAKAS_REGENERATION, 2));
 				}
 				// Apply lvl 1.
 				else if (lvl != 1)
 				{
 					npc.setTarget(npc);
-					npc.doCast(SkillTable.getInstance().getInfo(VALAKAS_REGENERATION, 1));
+					npc.doCast(SkillData.getInstance().getSkill(VALAKAS_REGENERATION, 1));
 				}
 			}
 			// Spawn cinematic, regen_task and choose of skill.
@@ -407,7 +407,7 @@ public final class Valakas extends AbstractNpcAI
 		// Debuff strider-mounted players.
 		if (attacker.getMountType() == MountType.STRIDER)
 		{
-			final L2Skill skill = SkillTable.getInstance().getInfo(4258, 1);
+			final Skill skill = SkillData.getInstance().getSkill(4258, 1);
 			if (!attacker.isAffectedBySkill(4258))
 			{
 				npc.setTarget(attacker);
@@ -492,7 +492,7 @@ public final class Valakas extends AbstractNpcAI
 			return;
 		}
 		
-		final L2Skill skill = getRandomSkill(npc).getSkill();
+		final Skill skill = getRandomSkill(npc).getSkill();
 		
 		// Cast the skill or follow the target.
 		if (Util.checkIfInRange((skill.getCastRange() < 600) ? 600 : skill.getCastRange(), npc, _actualVictim, true))

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Venom/Venom.java

@@ -33,7 +33,7 @@ import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
@@ -247,7 +247,7 @@ public final class Venom extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onSpellFinished(L2Npc npc, L2PcInstance player, L2Skill skill)
+	public String onSpellFinished(L2Npc npc, L2PcInstance player, Skill skill)
 	{
 		switch (skill.getId())
 		{

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Zaken.java

@@ -25,7 +25,7 @@ import com.l2jserver.gameserver.GameTimeController;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.datatables.DoorTable;
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.enums.MountType;
 import com.l2jserver.gameserver.instancemanager.GrandBossManager;
 import com.l2jserver.gameserver.model.L2Object;
@@ -36,7 +36,7 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2GrandBossInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.zone.type.L2BossZone;
 import com.l2jserver.gameserver.network.serverpackets.PlaySound;
 
@@ -263,13 +263,13 @@ public final class Zaken extends AbstractNpcAI
 				if (sk_4223) // use night face if zaken have day face
 				{
 					npc.setTarget(npc);
-					npc.doCast(SkillTable.getInstance().getInfo(4224, 1));
+					npc.doCast(SkillData.getInstance().getSkill(4224, 1));
 					_loc.setLocation(npc.getLocation());
 				}
 				if (!sk_4227) // use zaken regeneration
 				{
 					npc.setTarget(npc);
-					npc.doCast(SkillTable.getInstance().getInfo(4227, 1));
+					npc.doCast(SkillData.getInstance().getSkill(4227, 1));
 				}
 				if ((npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_ATTACK) && (_ai0 == 0))
 				{
@@ -392,7 +392,7 @@ public final class Zaken extends AbstractNpcAI
 							_loc.setY(Ycoords[i2] + getRandom(650));
 							_loc.setZ(Zcoords[i2]);
 							npc.setTarget(npc);
-							npc.doCast(SkillTable.getInstance().getInfo(4222, 1));
+							npc.doCast(SkillData.getInstance().getSkill(4222, 1));
 						}
 					}
 				}
@@ -442,14 +442,14 @@ public final class Zaken extends AbstractNpcAI
 			else if (!sk_4223) // use day face if not night time
 			{
 				npc.setTarget(npc);
-				npc.doCast(SkillTable.getInstance().getInfo(4223, 1));
+				npc.doCast(SkillData.getInstance().getSkill(4223, 1));
 				_quest2 = 3;
 			}
 			
 			if (sk_4227) // when switching to day time, cancel zaken night regen
 			{
 				npc.setTarget(npc);
-				npc.doCast(SkillTable.getInstance().getInfo(4242, 1));
+				npc.doCast(SkillData.getInstance().getSkill(4242, 1));
 			}
 			
 			if (getRandom(40) < 1)
@@ -459,14 +459,14 @@ public final class Zaken extends AbstractNpcAI
 				_loc.setY(Ycoords[i2] + getRandom(650));
 				_loc.setZ(Zcoords[i2]);
 				npc.setTarget(npc);
-				npc.doCast(SkillTable.getInstance().getInfo(4222, 1));
+				npc.doCast(SkillData.getInstance().getSkill(4222, 1));
 			}
 			startQuestTimer("1001", 30000, npc, null, true);
 		}
 		if (event.equalsIgnoreCase("1002"))
 		{
 			_quest0 = 0;
-			npc.doCast(SkillTable.getInstance().getInfo(4222, 1));
+			npc.doCast(SkillData.getInstance().getSkill(4222, 1));
 			_ai0 = 0;
 		}
 		if (event.equalsIgnoreCase("1003"))
@@ -635,7 +635,7 @@ public final class Zaken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onSpellFinished(L2Npc npc, L2PcInstance player, L2Skill skill)
+	public String onSpellFinished(L2Npc npc, L2PcInstance player, Skill skill)
 	{
 		if (npc.getId() == ZAKEN)
 		{
@@ -771,7 +771,7 @@ public final class Zaken extends AbstractNpcAI
 				if (!sk_4258)
 				{
 					npc.setTarget(attacker);
-					npc.doCast(SkillTable.getInstance().getInfo(4258, 1));
+					npc.doCast(SkillData.getInstance().getSkill(4258, 1));
 				}
 			}
 			L2Character originalAttacker = isSummon ? attacker.getSummon() : attacker;
@@ -783,22 +783,22 @@ public final class Zaken extends AbstractNpcAI
 				if (i0 < 1)
 				{
 					npc.setTarget(attacker);
-					npc.doCast(SkillTable.getInstance().getInfo(4216, 1));
+					npc.doCast(SkillData.getInstance().getSkill(4216, 1));
 				}
 				else if (i0 < 2)
 				{
 					npc.setTarget(attacker);
-					npc.doCast(SkillTable.getInstance().getInfo(4217, 1));
+					npc.doCast(SkillData.getInstance().getSkill(4217, 1));
 				}
 				else if (i0 < 4)
 				{
 					npc.setTarget(attacker);
-					npc.doCast(SkillTable.getInstance().getInfo(4219, 1));
+					npc.doCast(SkillData.getInstance().getSkill(4219, 1));
 				}
 				else if (i0 < 8)
 				{
 					npc.setTarget(attacker);
-					npc.doCast(SkillTable.getInstance().getInfo(4218, 1));
+					npc.doCast(SkillData.getInstance().getSkill(4218, 1));
 				}
 				else if (i0 < 15)
 				{
@@ -811,7 +811,7 @@ public final class Zaken extends AbstractNpcAI
 						if (attacker != ((L2Attackable) npc).getMostHated())
 						{
 							npc.setTarget(attacker);
-							npc.doCast(SkillTable.getInstance().getInfo(4221, 1));
+							npc.doCast(SkillData.getInstance().getSkill(4221, 1));
 						}
 					}
 				}
@@ -820,7 +820,7 @@ public final class Zaken extends AbstractNpcAI
 					if (attacker == ((L2Attackable) npc).getMostHated())
 					{
 						npc.setTarget(attacker);
-						npc.doCast(SkillTable.getInstance().getInfo(4220, 1));
+						npc.doCast(SkillData.getInstance().getSkill(4220, 1));
 					}
 				}
 			}
@@ -835,7 +835,7 @@ public final class Zaken extends AbstractNpcAI
 				_loc.setY(Ycoords[i2] + getRandom(650));
 				_loc.setZ(Zcoords[i2]);
 				npc.setTarget(npc);
-				npc.doCast(SkillTable.getInstance().getInfo(4222, 1));
+				npc.doCast(SkillData.getInstance().getSkill(4222, 1));
 			}
 		}
 		return super.onAttack(npc, attacker, damage, isSummon);
@@ -871,7 +871,7 @@ public final class Zaken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onSkillSee(L2Npc npc, L2PcInstance caster, L2Skill skill, L2Object[] targets, boolean isSummon)
+	public String onSkillSee(L2Npc npc, L2PcInstance caster, Skill skill, L2Object[] targets, boolean isSummon)
 	{
 		int npcId = npc.getId();
 		if (npcId == ZAKEN)
@@ -886,22 +886,22 @@ public final class Zaken extends AbstractNpcAI
 				if (i0 < 1)
 				{
 					npc.setTarget(caster);
-					npc.doCast(SkillTable.getInstance().getInfo(4216, 1));
+					npc.doCast(SkillData.getInstance().getSkill(4216, 1));
 				}
 				else if (i0 < 2)
 				{
 					npc.setTarget(caster);
-					npc.doCast(SkillTable.getInstance().getInfo(4217, 1));
+					npc.doCast(SkillData.getInstance().getSkill(4217, 1));
 				}
 				else if (i0 < 4)
 				{
 					npc.setTarget(caster);
-					npc.doCast(SkillTable.getInstance().getInfo(4219, 1));
+					npc.doCast(SkillData.getInstance().getSkill(4219, 1));
 				}
 				else if (i0 < 8)
 				{
 					npc.setTarget(caster);
-					npc.doCast(SkillTable.getInstance().getInfo(4218, 1));
+					npc.doCast(SkillData.getInstance().getSkill(4218, 1));
 				}
 				else if (i0 < 15)
 				{
@@ -914,7 +914,7 @@ public final class Zaken extends AbstractNpcAI
 						if (caster != ((L2Attackable) npc).getMostHated())
 						{
 							npc.setTarget(caster);
-							npc.doCast(SkillTable.getInstance().getInfo(4221, 1));
+							npc.doCast(SkillData.getInstance().getSkill(4221, 1));
 						}
 					}
 				}
@@ -923,7 +923,7 @@ public final class Zaken extends AbstractNpcAI
 					if (caster == ((L2Attackable) npc).getMostHated())
 					{
 						npc.setTarget(caster);
-						npc.doCast(SkillTable.getInstance().getInfo(4220, 1));
+						npc.doCast(SkillData.getInstance().getSkill(4220, 1));
 					}
 				}
 			}
@@ -974,22 +974,22 @@ public final class Zaken extends AbstractNpcAI
 					if (i0 < 1)
 					{
 						npc.setTarget(player);
-						npc.doCast(SkillTable.getInstance().getInfo(4216, 1));
+						npc.doCast(SkillData.getInstance().getSkill(4216, 1));
 					}
 					else if (i0 < 2)
 					{
 						npc.setTarget(player);
-						npc.doCast(SkillTable.getInstance().getInfo(4217, 1));
+						npc.doCast(SkillData.getInstance().getSkill(4217, 1));
 					}
 					else if (i0 < 4)
 					{
 						npc.setTarget(player);
-						npc.doCast(SkillTable.getInstance().getInfo(4219, 1));
+						npc.doCast(SkillData.getInstance().getSkill(4219, 1));
 					}
 					else if (i0 < 8)
 					{
 						npc.setTarget(player);
-						npc.doCast(SkillTable.getInstance().getInfo(4218, 1));
+						npc.doCast(SkillData.getInstance().getSkill(4218, 1));
 					}
 					else if (i0 < 15)
 					{
@@ -1002,7 +1002,7 @@ public final class Zaken extends AbstractNpcAI
 							if (player != ((L2Attackable) npc).getMostHated())
 							{
 								npc.setTarget(player);
-								npc.doCast(SkillTable.getInstance().getInfo(4221, 1));
+								npc.doCast(SkillData.getInstance().getSkill(4221, 1));
 							}
 						}
 					}
@@ -1011,7 +1011,7 @@ public final class Zaken extends AbstractNpcAI
 						if (player == ((L2Attackable) npc).getMostHated())
 						{
 							npc.setTarget(player);
-							npc.doCast(SkillTable.getInstance().getInfo(4220, 1));
+							npc.doCast(SkillData.getInstance().getSkill(4220, 1));
 						}
 					}
 				}

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java

@@ -6,7 +6,7 @@ import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.datatables.MultisellData;
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.datatables.SkillTreesData;
 import com.l2jserver.gameserver.instancemanager.QuestManager;
 import com.l2jserver.gameserver.model.L2SkillLearn;
@@ -15,7 +15,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.AcquireSkillType;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.clientpackets.RequestAcquireSkill;
 import com.l2jserver.gameserver.network.serverpackets.AcquireSkillList;
@@ -58,7 +58,7 @@ public class AvantGarde extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAcquireSkill(L2Npc npc, L2PcInstance player, L2Skill skill, AcquireSkillType type)
+	public String onAcquireSkill(L2Npc npc, L2PcInstance player, Skill skill, AcquireSkillType type)
 	{
 		switch (type)
 		{
@@ -203,7 +203,7 @@ public class AvantGarde extends AbstractNpcAI
 									if (Util.isDigit(skillIdVar))
 									{
 										int skillId = Integer.parseInt(skillIdVar);
-										final L2Skill sk = SkillTable.getInstance().getInfo(skillId, 1);
+										final Skill sk = SkillData.getInstance().getSkill(skillId, 1);
 										if (sk != null)
 										{
 											player.removeSkill(sk);
@@ -294,7 +294,7 @@ public class AvantGarde extends AbstractNpcAI
 		
 		for (L2SkillLearn s : subClassSkills)
 		{
-			if (SkillTable.getInstance().getInfo(s.getSkillId(), s.getSkillLevel()) != null)
+			if (SkillData.getInstance().getSkill(s.getSkillId(), s.getSkillLevel()) != null)
 			{
 				count++;
 				asl.addSkill(s.getSkillId(), s.getSkillLevel(), s.getSkillLevel(), 0, 0);
@@ -322,7 +322,7 @@ public class AvantGarde extends AbstractNpcAI
 		
 		for (L2SkillLearn s : skills)
 		{
-			if (SkillTable.getInstance().getInfo(s.getSkillId(), s.getSkillLevel()) != null)
+			if (SkillData.getInstance().getSkill(s.getSkillId(), s.getSkillLevel()) != null)
 			{
 				counts++;
 				asl.addSkill(s.getSkillId(), s.getSkillLevel(), s.getSkillLevel(), s.getLevelUpSp(), 0);

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetle.java

@@ -24,7 +24,7 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 
 /**
  * Tar Beetle AI
@@ -75,7 +75,7 @@ public final class TarBeetle extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onSpellFinished(L2Npc npc, L2PcInstance player, L2Skill skill)
+	public String onSpellFinished(L2Npc npc, L2PcInstance player, Skill skill)
 	{
 		if ((skill != null) && (skill.getId() == TAR_SPITE))
 		{

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/KetraOrcSupport/KetraOrcSupport.java

@@ -23,10 +23,10 @@ import java.util.Map;
 
 import ai.npc.AbstractNpcAI;
 
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.util.Util;
 
 /**
@@ -47,9 +47,9 @@ public final class KetraOrcSupport extends AbstractNpcAI
 			_cost = cost;
 		}
 		
-		public L2Skill getSkill()
+		public Skill getSkill()
 		{
-			return SkillTable.getInstance().getInfo(_skill, 1);
+			return SkillData.getInstance().getSkill(_skill, 1);
 		}
 		
 		public int getCost()

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferAI.java

@@ -24,7 +24,7 @@ import com.l2jserver.gameserver.model.L2Party;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.util.Util;
 
 /**
@@ -49,7 +49,7 @@ public class NpcBufferAI implements Runnable
 			return;
 		}
 		
-		final L2Skill skill = _skillData.getSkill();
+		final Skill skill = _skillData.getSkill();
 		if ((_npc.getSummoner() == null) || !_npc.getSummoner().isPlayer())
 		{
 			return;

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferSkillData.java

@@ -20,7 +20,7 @@ package ai.npc.NpcBuffers;
 
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.AffectObject;
 import com.l2jserver.gameserver.model.skills.targets.AffectScope;
 
@@ -44,7 +44,7 @@ public class NpcBufferSkillData
 		_affectObject = set.getEnum("affectObject", AffectObject.class);
 	}
 	
-	public L2Skill getSkill()
+	public Skill getSkill()
 	{
 		return _skill.getSkill();
 	}

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/NpcBuffers/impl/CabaleBuffer.java

@@ -24,11 +24,11 @@ import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.SevenSigns;
 import com.l2jserver.gameserver.ThreadPoolManager;
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
 
@@ -269,7 +269,7 @@ public final class CabaleBuffer extends AbstractNpcAI
 			
 			if (doCast)
 			{
-				final L2Skill skill = SkillTable.getInstance().getInfo(skillId, skillLevel);
+				final Skill skill = SkillData.getInstance().getSkill(skillId, skillLevel);
 				_npc.setTarget(player);
 				_npc.doCast(skill);
 				return true;

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/HealerTrainer.java

@@ -24,14 +24,14 @@ import java.util.List;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.datatables.SkillTreesData;
 import com.l2jserver.gameserver.model.L2SkillLearn;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.AcquireSkillType;
 import com.l2jserver.gameserver.model.holders.ItemHolder;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.AcquireSkillList;
 
@@ -122,7 +122,7 @@ public final class HealerTrainer extends AbstractNpcAI
 					final Collection<L2SkillLearn> skills = SkillTreesData.getInstance().getTransferSkillTree(player.getClassId()).values();
 					for (L2SkillLearn s : skills)
 					{
-						final L2Skill sk = player.getKnownSkill(s.getSkillId());
+						final Skill sk = player.getKnownSkill(s.getSkillId());
 						if (sk != null)
 						{
 							player.removeSkill(sk);
@@ -163,7 +163,7 @@ public final class HealerTrainer extends AbstractNpcAI
 		
 		for (L2SkillLearn s : skills)
 		{
-			if (SkillTable.getInstance().getInfo(s.getSkillId(), s.getSkillLevel()) != null)
+			if (SkillData.getInstance().getSkill(s.getSkillId(), s.getSkillLevel()) != null)
 			{
 				count++;
 				asl.addSkill(s.getSkillId(), s.getSkillLevel(), s.getSkillLevel(), s.getLevelUpSp(), 0);

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/VarkaSilenosSupport.java

@@ -23,10 +23,10 @@ import java.util.Map;
 
 import ai.npc.AbstractNpcAI;
 
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.util.Util;
 
 /**
@@ -47,9 +47,9 @@ public final class VarkaSilenosSupport extends AbstractNpcAI
 			_cost = cost;
 		}
 		
-		public L2Skill getSkill()
+		public Skill getSkill()
 		{
-			return SkillTable.getInstance().getInfo(_skill, 1);
+			return SkillData.getInstance().getSkill(_skill, 1);
 		}
 		
 		public int getCost()

L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/DevastatedCastle/DevastatedCastle.java

@@ -25,7 +25,7 @@ import java.util.Map.Entry;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.datatables.ClanTable;
 import com.l2jserver.gameserver.datatables.NpcData;
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -99,7 +99,7 @@ public final class DevastatedCastle extends ClanHallSiegeEngine
 			if ((npc.getCurrentHp() < GUSTAV_TRIGGER_HP) && (npc.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST))
 			{
 				broadcastNpcSay(npc, Say2.NPC_ALL, NpcStringId.THIS_IS_UNBELIEVABLE_HAVE_I_REALLY_BEEN_DEFEATED_I_SHALL_RETURN_AND_TAKE_YOUR_HEAD);
-				npc.getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, SkillTable.getInstance().getInfo(4235, 1), npc);
+				npc.getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, SkillData.getInstance().getSkill(4235, 1), npc);
 			}
 		}
 		return super.onAttack(npc, attacker, damage, isSummon);

L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java

@@ -38,7 +38,7 @@ import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.cache.HtmCache;
 import com.l2jserver.gameserver.datatables.ClanTable;
 import com.l2jserver.gameserver.datatables.NpcData;
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.datatables.SpawnTable;
 import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
 import com.l2jserver.gameserver.instancemanager.ZoneManager;
@@ -56,7 +56,7 @@ import com.l2jserver.gameserver.model.entity.clanhall.SiegeStatus;
 import com.l2jserver.gameserver.model.items.L2Item;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
 import com.l2jserver.gameserver.network.serverpackets.NpcSay;
 import com.l2jserver.gameserver.util.Util;
@@ -262,9 +262,9 @@ public final class RainbowSpringsChateau extends Quest
 		"Contact me at L2JForum =)"
 	};
 	
-	private static final L2Skill[] DEBUFFS =
+	private static final Skill[] DEBUFFS =
 	{
-		SkillTable.getInstance().getInfo(0, 1)
+		SkillData.getInstance().getSkill(0, 1)
 	};
 	
 	protected static Map<Integer, Long> _warDecreesCount = new HashMap<>();
@@ -783,7 +783,7 @@ public final class RainbowSpringsChateau extends Quest
 			{
 				if (chr != null)
 				{
-					for (L2Skill sk : DEBUFFS)
+					for (Skill sk : DEBUFFS)
 					{
 						sk.applyEffects(chr, chr);
 					}

L2J_DataPack_BETA/dist/game/data/scripts/custom/Validators/SkillTransferValidator.java

@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.ItemHolder;
 import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.scripting.scriptengine.events.ProfessionChangeEvent;
 import com.l2jserver.gameserver.scripting.scriptengine.impl.L2Script;
 import com.l2jserver.gameserver.util.Util;
@@ -101,7 +101,7 @@ public final class SkillTransferValidator extends L2Script
 				if (Config.SKILL_CHECK_ENABLE && (!player.canOverrideCond(PcCondOverride.SKILL_CONDITIONS) || Config.SKILL_CHECK_GM))
 				{
 					long count = PORMANDERS[index].getCount() - player.getInventory().getInventoryItemCount(PORMANDERS[index].getId(), -1, false);
-					for (L2Skill sk : player.getAllSkills())
+					for (Skill sk : player.getAllSkills())
 					{
 						for (L2SkillLearn s : SkillTreesData.getInstance().getTransferSkillTree(player.getClassId()).values())
 						{

L2J_DataPack_BETA/dist/game/data/scripts/custom/Validators/SubClassSkills.java

@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.util.Util;
 
 /**
@@ -107,12 +107,12 @@ public final class SubClassSkills extends Quest
 			return null;
 		}
 		
-		final L2Skill[] certSkills = getCertSkills(player);
+		final Skill[] certSkills = getCertSkills(player);
 		if (player.isSubClassActive())
 		{
 			if (certSkills != null)
 			{
-				for (L2Skill s : certSkills)
+				for (Skill s : certSkills)
 				{
 					Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has cert skill on subclass :" + s.getName() + "(" + s.getId() + "/" + s.getLevel() + "), class:" + ClassListData.getInstance().getClass(player.getClassId()).getClassName(), IllegalActionPunishmentType.NONE);
 					
@@ -125,7 +125,7 @@ public final class SubClassSkills extends Quest
 			return null;
 		}
 		
-		L2Skill skill;
+		Skill skill;
 		int[][] cSkills = null; // skillId/skillLvl
 		if (certSkills != null)
 		{
@@ -319,10 +319,10 @@ public final class SubClassSkills extends Quest
 		return null;
 	}
 	
-	private L2Skill[] getCertSkills(L2PcInstance player)
+	private Skill[] getCertSkills(L2PcInstance player)
 	{
-		FastList<L2Skill> tmp = null;
-		for (L2Skill s : player.getAllSkills())
+		FastList<Skill> tmp = null;
+		for (Skill s : player.getAllSkills())
 		{
 			if ((s != null) && (Arrays.binarySearch(_allCertSkillIds, s.getId()) >= 0))
 			{
@@ -339,7 +339,7 @@ public final class SubClassSkills extends Quest
 			return null;
 		}
 		
-		final L2Skill[] result = tmp.toArray(new L2Skill[tmp.size()]);
+		final Skill[] result = tmp.toArray(new Skill[tmp.size()]);
 		FastList.recycle(tmp);
 		return result;
 	}

L2J_DataPack_BETA/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java

@@ -25,7 +25,7 @@ import com.l2jserver.gameserver.model.event.LongTimeEvent;
 import com.l2jserver.gameserver.model.itemcontainer.Inventory;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.quest.State;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
@@ -124,7 +124,7 @@ public final class FreyaCelebration extends LongTimeEvent
 	}
 	
 	@Override
-	public String onSkillSee(L2Npc npc, L2PcInstance caster, L2Skill skill, L2Object[] targets, boolean isSummon)
+	public String onSkillSee(L2Npc npc, L2PcInstance caster, Skill skill, L2Object[] targets, boolean isSummon)
 	{
 		if ((caster == null) || (npc == null))
 		{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java

@@ -30,7 +30,6 @@ import com.l2jserver.gameserver.handler.BypassHandler;
 import com.l2jserver.gameserver.handler.ChatHandler;
 import com.l2jserver.gameserver.handler.ItemHandler;
 import com.l2jserver.gameserver.handler.PunishmentHandler;
-import com.l2jserver.gameserver.handler.SkillHandler;
 import com.l2jserver.gameserver.handler.TargetHandler;
 import com.l2jserver.gameserver.handler.TelnetHandler;
 import com.l2jserver.gameserver.handler.UserCommandHandler;
@@ -204,7 +203,6 @@ import handlers.itemhandlers.TeleportBookmark;
 import handlers.punishmenthandlers.BanHandler;
 import handlers.punishmenthandlers.ChatBanHandler;
 import handlers.punishmenthandlers.JailHandler;
-import handlers.skillhandlers.Dummy;
 import handlers.targethandlers.Area;
 import handlers.targethandlers.AreaCorpseMob;
 import handlers.targethandlers.AreaFriendly;
@@ -287,7 +285,6 @@ public class MasterHandler
 		ChatHandler.class,
 		ItemHandler.class,
 		PunishmentHandler.class,
-		SkillHandler.class,
 		UserCommandHandler.class,
 		VoicedCommandHandler.class,
 		TargetHandler.class,
@@ -485,10 +482,6 @@ public class MasterHandler
 			ChatBanHandler.class,
 			JailHandler.class,
 		},
-		{
-			// Skill Handlers
-			Dummy.class,
-		},
 		{
 			// User Command Handlers
 			ClanPenalty.class,

L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java

@@ -32,7 +32,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
 import com.l2jserver.gameserver.model.skills.AbnormalType;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.gameserver.network.serverpackets.SkillCoolTime;
@@ -224,8 +224,8 @@ public class AdminBuffs implements IAdminCommandHandler
 	 */
 	public static void switchSkills(L2PcInstance gmchar, boolean toAuraSkills)
 	{
-		final Collection<L2Skill> skills = toAuraSkills ? SkillTreesData.getInstance().getGMSkillTree().values() : SkillTreesData.getInstance().getGMAuraSkillTree().values();
-		for (L2Skill skill : skills)
+		final Collection<Skill> skills = toAuraSkills ? SkillTreesData.getInstance().getGMSkillTree().values() : SkillTreesData.getInstance().getGMAuraSkillTree().values();
+		for (Skill skill : skills)
 		{
 			gmchar.removeSkill(skill, false); // Don't Save GM skills to database
 		}
@@ -269,7 +269,7 @@ public class AdminBuffs implements IAdminCommandHandler
 		{
 			if ((count >= start) && (count < end))
 			{
-				final L2Skill skill = info.getSkill();
+				final Skill skill = info.getSkill();
 				for (AbstractEffect effect : info.getEffects())
 				{
 					StringUtil.append(html, "<tr><td>", (!info.isInUse() ? FONT_RED1 : "") + skill.getName(), " Lv ", String.valueOf(skill.getLevel()), " (", effect.getClass().getSimpleName(), ")" + (!info.isInUse() ? FONT_RED2 : ""), "</td><td>", skill.isToggle() ? "T (" + info.getTickCount(effect) + ")" : skill.isPassive() ? "P" : info.getTime() + "s", "</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ", Integer.toString(target.getObjectId()), " ", String.valueOf(skill.getId()), "\" width=30 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr>");

L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java

@@ -23,7 +23,7 @@ import java.util.StringTokenizer;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.communitybbs.Manager.RegionBBSManager;
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.enums.Team;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.L2Object;
@@ -33,7 +33,7 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2ChestInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.skills.AbnormalVisualEffect;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.CharInfo;
 import com.l2jserver.gameserver.network.serverpackets.Earthquake;
@@ -336,7 +336,7 @@ public class AdminEffects implements IAdminCommandHandler
 				activeChar.stopSkillEffects((val == 0) && sendMessage, 7029);
 				if ((val >= 1) && (val <= 4))
 				{
-					L2Skill gmSpeedSkill = SkillTable.getInstance().getInfo(7029, val);
+					Skill gmSpeedSkill = SkillData.getInstance().getSkill(7029, val);
 					activeChar.doSimultaneousCast(gmSpeedSkill);
 				}
 			}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java

@@ -34,7 +34,7 @@ import com.l2jserver.gameserver.datatables.EnchantItemGroupsData;
 import com.l2jserver.gameserver.datatables.ItemTable;
 import com.l2jserver.gameserver.datatables.MultisellData;
 import com.l2jserver.gameserver.datatables.NpcData;
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.datatables.TeleportLocationTable;
 import com.l2jserver.gameserver.datatables.TransformData;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
@@ -170,7 +170,7 @@ public class AdminReload implements IAdminCommandHandler
 				}
 				case "skill":
 				{
-					SkillTable.getInstance().reload();
+					SkillData.getInstance().reload();
 					AdminTable.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Skills.");
 					break;
 				}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java

@@ -25,14 +25,14 @@ import java.util.logging.Logger;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.datatables.ClassListData;
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.datatables.SkillTreesData;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2SkillLearn;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.gameserver.network.serverpackets.PledgeSkillList;
@@ -81,7 +81,7 @@ public class AdminSkill implements IAdminCommandHandler
 		"admin_setskill"
 	};
 	
-	private static L2Skill[] adminSkills;
+	private static Skill[] adminSkills;
 	
 	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
@@ -170,7 +170,7 @@ public class AdminSkill implements IAdminCommandHandler
 				return false;
 			}
 			final L2PcInstance player = target.getActingPlayer();
-			for (L2Skill skill : player.getAllSkills())
+			for (Skill skill : player.getAllSkills())
 			{
 				player.removeSkill(skill);
 			}
@@ -196,7 +196,7 @@ public class AdminSkill implements IAdminCommandHandler
 			String[] split = command.split(" ");
 			int id = Integer.parseInt(split[1]);
 			int lvl = Integer.parseInt(split[2]);
-			L2Skill skill = SkillTable.getInstance().getInfo(id, lvl);
+			Skill skill = SkillData.getInstance().getSkill(id, lvl);
 			activeChar.addSkill(skill);
 			activeChar.sendSkillList();
 			activeChar.sendMessage("You added yourself skill " + skill.getName() + "(" + id + ") level " + lvl);
@@ -253,10 +253,10 @@ public class AdminSkill implements IAdminCommandHandler
 		}
 		
 		final List<L2SkillLearn> skills = SkillTreesData.getInstance().getAvailablePledgeSkills(clan);
-		SkillTable st = SkillTable.getInstance();
+		SkillData st = SkillData.getInstance();
 		for (L2SkillLearn s : skills)
 		{
-			clan.addNewSkill(st.getInfo(s.getSkillId(), s.getSkillLevel()));
+			clan.addNewSkill(st.getSkill(s.getSkillId(), s.getSkillLevel()));
 		}
 		
 		// Notify target and active char
@@ -285,7 +285,7 @@ public class AdminSkill implements IAdminCommandHandler
 		}
 		
 		final L2PcInstance player = target.getActingPlayer();
-		final L2Skill[] skills = player.getAllSkills().toArray(new L2Skill[player.getAllSkills().size()]);
+		final Skill[] skills = player.getAllSkills().toArray(new Skill[player.getAllSkills().size()]);
 		
 		int maxSkillsPerPage = 10;
 		int maxPages = skills.length / maxSkillsPerPage;
@@ -365,13 +365,13 @@ public class AdminSkill implements IAdminCommandHandler
 		}
 		else
 		{
-			L2Skill[] skills = player.getAllSkills().toArray(new L2Skill[player.getAllSkills().size()]);
-			adminSkills = activeChar.getAllSkills().toArray(new L2Skill[activeChar.getAllSkills().size()]);
-			for (L2Skill skill : adminSkills)
+			Skill[] skills = player.getAllSkills().toArray(new Skill[player.getAllSkills().size()]);
+			adminSkills = activeChar.getAllSkills().toArray(new Skill[activeChar.getAllSkills().size()]);
+			for (Skill skill : adminSkills)
 			{
 				activeChar.removeSkill(skill);
 			}
-			for (L2Skill skill : skills)
+			for (Skill skill : skills)
 			{
 				activeChar.addSkill(skill, true);
 			}
@@ -399,20 +399,20 @@ public class AdminSkill implements IAdminCommandHandler
 		}
 		else
 		{
-			L2Skill[] skills = player.getAllSkills().toArray(new L2Skill[player.getAllSkills().size()]);
-			for (L2Skill skill : skills)
+			Skill[] skills = player.getAllSkills().toArray(new Skill[player.getAllSkills().size()]);
+			for (Skill skill : skills)
 			{
 				player.removeSkill(skill);
 			}
-			for (L2Skill skill : activeChar.getAllSkills())
+			for (Skill skill : activeChar.getAllSkills())
 			{
 				player.addSkill(skill, true);
 			}
-			for (L2Skill skill : skills)
+			for (Skill skill : skills)
 			{
 				activeChar.removeSkill(skill);
 			}
-			for (L2Skill skill : adminSkills)
+			for (Skill skill : adminSkills)
 			{
 				activeChar.addSkill(skill, true);
 			}
@@ -446,14 +446,14 @@ public class AdminSkill implements IAdminCommandHandler
 		}
 		else
 		{
-			L2Skill skill = null;
+			Skill skill = null;
 			try
 			{
 				String id = st.nextToken();
 				String level = st.nextToken();
 				int idval = Integer.parseInt(id);
 				int levelval = Integer.parseInt(level);
-				skill = SkillTable.getInstance().getInfo(idval, levelval);
+				skill = SkillData.getInstance().getSkill(idval, levelval);
 			}
 			catch (Exception e)
 			{
@@ -495,7 +495,7 @@ public class AdminSkill implements IAdminCommandHandler
 			return;
 		}
 		final L2PcInstance player = target.getActingPlayer();
-		L2Skill skill = SkillTable.getInstance().getInfo(idval, player.getSkillLevel(idval));
+		Skill skill = SkillData.getInstance().getSkill(idval, player.getSkillLevel(idval));
 		if (skill != null)
 		{
 			String skillname = skill.getName();
@@ -546,7 +546,7 @@ public class AdminSkill implements IAdminCommandHandler
 			return;
 		}
 		
-		final L2Skill skill = SkillTable.getInstance().getInfo(id, level);
+		final Skill skill = SkillData.getInstance().getSkill(id, level);
 		if (skill == null)
 		{
 			activeChar.sendMessage("Error: there is no such skill.");

L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java

@@ -23,12 +23,12 @@ import java.util.StringTokenizer;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.ThreadPoolManager;
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
@@ -107,7 +107,7 @@ public class AdminTest implements IAdminCommandHandler
 			caster = (L2Character) target;
 		}
 		
-		L2Skill _skill = SkillTable.getInstance().getInfo(id, 1);
+		Skill _skill = SkillData.getInstance().getSkill(id, 1);
 		if (_skill != null)
 		{
 			caster.setTarget(activeChar);

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java

@@ -36,7 +36,7 @@ import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.olympiad.CompetitionType;
 import com.l2jserver.gameserver.model.olympiad.Olympiad;
 import com.l2jserver.gameserver.model.olympiad.OlympiadManager;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExHeroList;
 import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
@@ -251,7 +251,7 @@ public class OlympiadManagerLink implements IBypassHandler
 					return false;
 				}
 				
-				L2Skill skill = npcBuffGroupInfo.getSkill().getSkill();
+				Skill skill = npcBuffGroupInfo.getSkill().getSkill();
 				target.setTarget(activeChar);
 				
 				if (activeChar.olyBuff > 0)

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SupportBlessing.java

@@ -18,7 +18,7 @@
  */
 package handlers.bypasshandlers;
 
-import com.l2jserver.gameserver.datatables.SkillTable.FrequentSkill;
+import com.l2jserver.gameserver.datatables.SkillData.FrequentSkill;
 import com.l2jserver.gameserver.handler.IBypassHandler;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java

@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.items.L2Weapon;
 import com.l2jserver.gameserver.model.items.type.L2WeaponType;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.stats.BaseStats;
 import com.l2jserver.gameserver.model.stats.Formulas;
 import com.l2jserver.gameserver.model.stats.Stats;
@@ -81,7 +81,7 @@ public final class EnergyAttack extends AbstractEffect
 		}
 		
 		final L2Character target = info.getEffected();
-		final L2Skill skill = info.getSkill();
+		final Skill skill = info.getSkill();
 		
 		double attack = attacker.getPAtk(target);
 		int defence = target.getPDef(attacker);

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FocusMaxEnergy.java

@@ -22,7 +22,7 @@ import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 
 /**
  * Focus Max Energy effect implementation.
@@ -46,8 +46,8 @@ public final class FocusMaxEnergy extends AbstractEffect
 	{
 		if (info.getEffected().isPlayer())
 		{
-			final L2Skill sonicMastery = info.getEffected().getSkills().get(992);
-			final L2Skill focusMastery = info.getEffected().getSkills().get(993);
+			final Skill sonicMastery = info.getEffected().getSkills().get(992);
+			final Skill focusMastery = info.getEffected().getSkills().get(993);
 			int maxCharge = (sonicMastery != null) ? sonicMastery.getLevel() : (focusMastery != null) ? focusMastery.getLevel() : 0;
 			if (maxCharge != 0)
 			{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java

@@ -18,12 +18,12 @@
  */
 package handlers.effecthandlers;
 
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 
 /**
  * Set Skill effect implementation.
@@ -55,7 +55,7 @@ public final class SetSkill extends AbstractEffect
 			return;
 		}
 		
-		final L2Skill skill = SkillTable.getInstance().getInfo(_skillId, _skillLvl);
+		final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLvl);
 		if (skill == null)
 		{
 			return;

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java

@@ -24,7 +24,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.util.Rnd;
 
 /**
@@ -109,9 +109,9 @@ public final class SummonCubic extends AbstractEffect
 			// Players with no mastery can have only one cubic.
 			int allowedCubicCount = 1;
 			// TODO: Unhardcode skill ID check so effect could work on any skill.
-			if (player.isAffectedBySkill(L2Skill.SKILL_CUBIC_MASTERY))
+			if (player.isAffectedBySkill(Skill.SKILL_CUBIC_MASTERY))
 			{
-				final BuffInfo cubicMastery = player.getEffectList().getBuffInfoBySkillId(L2Skill.SKILL_CUBIC_MASTERY);
+				final BuffInfo cubicMastery = player.getEffectList().getBuffInfoBySkillId(Skill.SKILL_CUBIC_MASTERY);
 				for (AbstractEffect effect : cubicMastery.getEffects())
 				{
 					allowedCubicCount = effect != null ? (int) effect.getValue() : 1;

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java

@@ -29,7 +29,7 @@ import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.util.Rnd;
 
@@ -60,7 +60,7 @@ public class TriggerSkillByDamage extends AbstractEffect implements IDamageRecei
 	}
 	
 	@Override
-	public void onDamageReceivedEvent(L2Character attacker, L2Character target, double damage, L2Skill skill, boolean crit, boolean damageOverTime)
+	public void onDamageReceivedEvent(L2Character attacker, L2Character target, double damage, Skill skill, boolean crit, boolean damageOverTime)
 	{
 		if (damageOverTime || (_chance == 0) || (_skill.getSkillLvl() == 0))
 		{
@@ -89,7 +89,7 @@ public class TriggerSkillByDamage extends AbstractEffect implements IDamageRecei
 			return;
 		}
 		
-		final L2Skill triggerSkill = _skill.getSkill();
+		final Skill triggerSkill = _skill.getSkill();
 		final L2Object[] targets = targetHandler.getTargetList(triggerSkill, target, false, attacker);
 		for (L2Object triggerTarget : targets)
 		{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EventItem.java

@@ -27,7 +27,7 @@ import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2BlockInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
@@ -74,7 +74,7 @@ public class EventItem implements IItemHandler
 			return false;
 		}
 		
-		final L2Skill sk = item.getEtcItem().getSkills()[0].getSkill();
+		final Skill sk = item.getEtcItem().getSkills()[0].getSkill();
 		if (sk == null)
 		{
 			return false;

L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java

@@ -25,7 +25,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
@@ -78,7 +78,7 @@ public class ItemSkillsTemplate implements IItemHandler
 				continue;
 			}
 			
-			L2Skill itemSkill = skillInfo.getSkill();
+			Skill itemSkill = skillInfo.getSkill();
 			if (itemSkill != null)
 			{
 				if (!itemSkill.checkCondition(playable, playable.getTarget(), false))
@@ -162,7 +162,7 @@ public class ItemSkillsTemplate implements IItemHandler
 	 * @param item the item being used
 	 * @return {@code true} if the the item or skill to check is available, {@code false} otherwise
 	 */
-	private boolean checkReuse(L2Playable playable, L2Skill skill, L2ItemInstance item)
+	private boolean checkReuse(L2Playable playable, Skill skill, L2ItemInstance item)
 	{
 		final long remainingTime = (skill != null) ? playable.getSkillRemainingReuseTime(skill.getReuseHashCode()) : playable.getItemRemainingReuseTime(item.getObjectId());
 		final boolean isAvailable = remainingTime <= 0;

L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PetFood.java

@@ -22,14 +22,14 @@ import java.util.List;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.datatables.PetDataTable;
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
@@ -61,7 +61,7 @@ public class PetFood implements IItemHandler
 	
 	public boolean useFood(L2Playable activeChar, int skillId, int skillLevel, L2ItemInstance item)
 	{
-		final L2Skill skill = SkillTable.getInstance().getInfo(skillId, skillLevel);
+		final Skill skill = SkillData.getInstance().getSkill(skillId, skillLevel);
 		if (skill != null)
 		{
 			if (activeChar.isPet())

L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Dummy.java

@@ -1,129 +0,0 @@
-/*
- * Copyright (C) 2004-2014 L2J DataPack
- * 
- * This file is part of L2J DataPack.
- * 
- * L2J DataPack is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * L2J DataPack is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.skillhandlers;
-
-import com.l2jserver.gameserver.enums.ShotType;
-import com.l2jserver.gameserver.handler.ISkillHandler;
-import com.l2jserver.gameserver.instancemanager.HandysBlockCheckerManager;
-import com.l2jserver.gameserver.model.ArenaParticipantsHolder;
-import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.instance.L2BlockInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.skills.EffectScope;
-import com.l2jserver.gameserver.model.skills.L2Skill;
-import com.l2jserver.gameserver.model.skills.L2SkillType;
-import com.l2jserver.gameserver.model.stats.Formulas;
-
-public class Dummy implements ISkillHandler
-{
-	private static final L2SkillType[] SKILL_IDS =
-	{
-		L2SkillType.DUMMY
-	};
-	
-	@Override
-	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
-	{
-		switch (skill.getId())
-		{
-			case 5852:
-			case 5853:
-			{
-				final L2Object obj = targets[0];
-				if (obj != null)
-				{
-					useBlockCheckerSkill(activeChar.getActingPlayer(), skill, obj);
-				}
-				break;
-			}
-			default:
-			{
-				for (L2Character target : (L2Character[]) targets)
-				{
-					if (Formulas.calcBuffDebuffReflection(target, skill))
-					{
-						skill.applyEffects(target, activeChar);
-					}
-					else
-					{
-						skill.applyEffects(activeChar, target);
-					}
-				}
-				break;
-			}
-		}
-		
-		// Self Effect
-		if (skill.hasEffects(EffectScope.SELF))
-		{
-			if (activeChar.isAffectedBySkill(skill.getId()))
-			{
-				activeChar.stopSkillEffects(true, skill.getId());
-			}
-			skill.applyEffects(activeChar, null, activeChar, true, false, true, 0);
-		}
-		
-		if (skill.useSpiritShot())
-		{
-			activeChar.setChargedShot(activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS, false);
-		}
-		else
-		{
-			activeChar.setChargedShot(ShotType.SOULSHOTS, false);
-		}
-	}
-	
-	@Override
-	public L2SkillType[] getSkillIds()
-	{
-		return SKILL_IDS;
-	}
-	
-	private final void useBlockCheckerSkill(L2PcInstance activeChar, L2Skill skill, L2Object target)
-	{
-		if (!(target instanceof L2BlockInstance))
-		{
-			return;
-		}
-		
-		L2BlockInstance block = (L2BlockInstance) target;
-		
-		final int arena = activeChar.getBlockCheckerArena();
-		if (arena != -1)
-		{
-			final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(arena);
-			if (holder == null)
-			{
-				return;
-			}
-			
-			final int team = holder.getPlayerTeam(activeChar);
-			final int color = block.getColorEffect();
-			if ((team == 0) && (color == 0x00))
-			{
-				block.changeColor(activeChar, holder, team);
-			}
-			else if ((team == 1) && (color == 0x53))
-			{
-				block.changeColor(activeChar, holder, team);
-			}
-		}
-	}
-}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/Area.java

@@ -25,7 +25,7 @@ import java.util.List;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -37,7 +37,7 @@ import com.l2jserver.gameserver.util.Util;
 public class Area implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new ArrayList<>();
 		if ((target == null) || (((target == activeChar) || target.isAlikeDead()) && (skill.getCastRange() >= 0)) || (!(target.isAttackable() || target.isPlayable())))
@@ -51,7 +51,7 @@ public class Area implements ITargetTypeHandler
 		
 		if (skill.getCastRange() >= 0)
 		{
-			if (!L2Skill.checkForAreaOffensiveSkills(activeChar, target, skill, srcInArena))
+			if (!Skill.checkForAreaOffensiveSkills(activeChar, target, skill, srcInArena))
 			{
 				return EMPTY_TARGET_LIST;
 			}
@@ -88,7 +88,7 @@ public class Area implements ITargetTypeHandler
 			
 			if (Util.checkIfInRange(skill.getAffectRange(), origin, obj, true))
 			{
-				if (!L2Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
+				if (!Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
 				{
 					continue;
 				}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/AreaCorpseMob.java

@@ -25,7 +25,7 @@ import java.util.List;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -37,7 +37,7 @@ import com.l2jserver.gameserver.util.Util;
 public class AreaCorpseMob implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		if ((target == null) || !target.isAttackable() || !target.isDead())
 		{
@@ -65,7 +65,7 @@ public class AreaCorpseMob implements ITargetTypeHandler
 				continue;
 			}
 			
-			if (!L2Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
+			if (!Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
 			{
 				continue;
 			}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/AreaFriendly.java

@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2SiegeFlagInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
@@ -40,7 +40,7 @@ import com.l2jserver.gameserver.network.SystemMessageId;
 public class AreaFriendly implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new ArrayList<>();
 		if (!checkTarget(activeChar, target) && (skill.getCastRange() >= 0))

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/AreaSummon.java

@@ -25,7 +25,7 @@ import java.util.List;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.util.Util;
@@ -36,7 +36,7 @@ import com.l2jserver.gameserver.util.Util;
 public class AreaSummon implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new ArrayList<>();
 		target = activeChar.getSummon();
@@ -74,7 +74,7 @@ public class AreaSummon implements ITargetTypeHandler
 				continue;
 			}
 			
-			if (!L2Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
+			if (!Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
 			{
 				continue;
 			}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/Aura.java

@@ -26,7 +26,7 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 
@@ -36,7 +36,7 @@ import com.l2jserver.gameserver.model.zone.ZoneId;
 public class Aura implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new ArrayList<>();
 		final boolean srcInArena = (activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE));
@@ -55,7 +55,7 @@ public class Aura implements ITargetTypeHandler
 					}
 				}
 				
-				if (!L2Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
+				if (!Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
 				{
 					continue;
 				}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/AuraCorpseMob.java

@@ -25,7 +25,7 @@ import java.util.List;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 
 /**
@@ -34,7 +34,7 @@ import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 public class AuraCorpseMob implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new ArrayList<>();
 		// Go through the L2Character _knownList

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/BehindArea.java

@@ -25,7 +25,7 @@ import java.util.List;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -37,7 +37,7 @@ import com.l2jserver.gameserver.util.Util;
 public class BehindArea implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new ArrayList<>();
 		if ((target == null) || (((target == activeChar) || target.isAlikeDead()) && (skill.getCastRange() >= 0)) || (!(target.isAttackable() || target.isPlayable())))
@@ -51,7 +51,7 @@ public class BehindArea implements ITargetTypeHandler
 		
 		if (skill.getCastRange() >= 0)
 		{
-			if (!L2Skill.checkForAreaOffensiveSkills(activeChar, target, skill, srcInArena))
+			if (!Skill.checkForAreaOffensiveSkills(activeChar, target, skill, srcInArena))
 			{
 				return EMPTY_TARGET_LIST;
 			}
@@ -93,7 +93,7 @@ public class BehindArea implements ITargetTypeHandler
 					continue;
 				}
 				
-				if (!L2Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
+				if (!Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
 				{
 					continue;
 				}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/BehindAura.java

@@ -25,7 +25,7 @@ import java.util.List;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 
@@ -35,7 +35,7 @@ import com.l2jserver.gameserver.model.zone.ZoneId;
 public class BehindAura implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new ArrayList<>();
 		final boolean srcInArena = (activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE));
@@ -51,7 +51,7 @@ public class BehindAura implements ITargetTypeHandler
 					continue;
 				}
 				
-				if (!L2Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
+				if (!Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
 				{
 					continue;
 				}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/Clan.java

@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.util.Util;
 
@@ -40,7 +40,7 @@ import com.l2jserver.gameserver.util.Util;
 public class Clan implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new ArrayList<>();
 		
@@ -74,7 +74,7 @@ public class Clan implements ITargetTypeHandler
 			final int radius = skill.getAffectRange();
 			final L2Clan clan = player.getClan();
 			
-			if (L2Skill.addSummon(activeChar, player, radius, false))
+			if (Skill.addSummon(activeChar, player, radius, false))
 			{
 				targetList.add(player.getSummon());
 			}
@@ -114,12 +114,12 @@ public class Clan implements ITargetTypeHandler
 						continue;
 					}
 					
-					if (!onlyFirst && L2Skill.addSummon(activeChar, obj, radius, false))
+					if (!onlyFirst && Skill.addSummon(activeChar, obj, radius, false))
 					{
 						targetList.add(obj.getSummon());
 					}
 					
-					if (!L2Skill.addCharacter(activeChar, obj, radius, false))
+					if (!Skill.addCharacter(activeChar, obj, radius, false))
 					{
 						continue;
 					}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/ClanMember.java

@@ -26,7 +26,7 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.util.Util;
 
@@ -36,7 +36,7 @@ import com.l2jserver.gameserver.util.Util;
 public class ClanMember implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new ArrayList<>();
 		if (activeChar.isNpc())

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/CommandChannel.java

@@ -26,7 +26,7 @@ import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Party;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 
 /**
@@ -35,7 +35,7 @@ import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 public class CommandChannel implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		final List<L2Character> targetList = new ArrayList<>();
 		final L2PcInstance player = activeChar.getActingPlayer();
@@ -50,7 +50,7 @@ public class CommandChannel implements ITargetTypeHandler
 		final L2Party party = player.getParty();
 		final boolean hasChannel = (party != null) && party.isInCommandChannel();
 		
-		if (L2Skill.addSummon(activeChar, player, radius, false))
+		if (Skill.addSummon(activeChar, player, radius, false))
 		{
 			targetList.add(player.getSummon());
 		}
@@ -72,7 +72,7 @@ public class CommandChannel implements ITargetTypeHandler
 				continue;
 			}
 			
-			if (L2Skill.addCharacter(activeChar, member, radius, false))
+			if (Skill.addCharacter(activeChar, member, radius, false))
 			{
 				targetList.add(member);
 				if (targetList.size() >= maxTargets)

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/CorpseClan.java

@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.util.Util;
@@ -41,7 +41,7 @@ import com.l2jserver.gameserver.util.Util;
 public class CorpseClan implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Object> targetList = new ArrayList<>();
 		if (activeChar.isPlayable())
@@ -96,7 +96,7 @@ public class CorpseClan implements ITargetTypeHandler
 						continue;
 					}
 					
-					if (!L2Skill.addCharacter(activeChar, obj, radius, true))
+					if (!Skill.addCharacter(activeChar, obj, radius, true))
 					{
 						continue;
 					}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/CorpseMob.java

@@ -24,7 +24,7 @@ import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.effects.L2EffectType;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
@@ -35,7 +35,7 @@ import com.l2jserver.gameserver.network.SystemMessageId;
 public class CorpseMob implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		if ((target == null) || !target.isAttackable() || !target.isDead())
 		{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/EnemySummon.java

@@ -22,7 +22,7 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Summon;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 
@@ -32,7 +32,7 @@ import com.l2jserver.gameserver.model.zone.ZoneId;
 public class EnemySummon implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		if (target.isSummon())
 		{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/FlagPole.java

@@ -21,7 +21,7 @@ package handlers.targethandlers;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 
 /**
@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 public class FlagPole implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		if (!activeChar.isPlayer())
 		{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/FrontArea.java

@@ -25,7 +25,7 @@ import java.util.List;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -37,7 +37,7 @@ import com.l2jserver.gameserver.util.Util;
 public class FrontArea implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new ArrayList<>();
 		if ((target == null) || (((target == activeChar) || target.isAlikeDead()) && (skill.getCastRange() >= 0)) || (!(target.isAttackable() || target.isPlayable())))
@@ -51,7 +51,7 @@ public class FrontArea implements ITargetTypeHandler
 		
 		if (skill.getCastRange() >= 0)
 		{
-			if (!L2Skill.checkForAreaOffensiveSkills(activeChar, target, skill, srcInArena))
+			if (!Skill.checkForAreaOffensiveSkills(activeChar, target, skill, srcInArena))
 			{
 				return EMPTY_TARGET_LIST;
 			}
@@ -93,7 +93,7 @@ public class FrontArea implements ITargetTypeHandler
 					continue;
 				}
 				
-				if (!L2Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
+				if (!Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
 				{
 					continue;
 				}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/FrontAura.java

@@ -25,7 +25,7 @@ import java.util.List;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 
@@ -35,7 +35,7 @@ import com.l2jserver.gameserver.model.zone.ZoneId;
 public class FrontAura implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new ArrayList<>();
 		final boolean srcInArena = (activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE));
@@ -51,7 +51,7 @@ public class FrontAura implements ITargetTypeHandler
 					continue;
 				}
 				
-				if (!L2Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
+				if (!Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
 				{
 					continue;
 				}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/Ground.java

@@ -21,7 +21,7 @@ package handlers.targethandlers;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 
 /**
@@ -31,7 +31,7 @@ public class Ground implements ITargetTypeHandler
 {
 	
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		return new L2Character[]
 		{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/Holy.java

@@ -22,7 +22,7 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2ArtefactInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 
 /**
@@ -31,7 +31,7 @@ import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 public class Holy implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		if (!(target instanceof L2ArtefactInstance))
 		{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/One.java

@@ -21,7 +21,7 @@ package handlers.targethandlers;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
@@ -31,7 +31,7 @@ import com.l2jserver.gameserver.network.SystemMessageId;
 public class One implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		// Check for null target or any other invalid target
 		if ((target == null) || target.isDead() || ((target == activeChar) && skill.isBad()))

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/OwnerPet.java

@@ -22,7 +22,7 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Summon;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 
 /**
@@ -31,7 +31,7 @@ import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 public class OwnerPet implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		if (activeChar.isSummon())
 		{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/Party.java

@@ -25,7 +25,7 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 
 /**
@@ -34,7 +34,7 @@ import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 public class Party implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new ArrayList<>();
 		if (onlyFirst)
@@ -51,14 +51,14 @@ public class Party implements ITargetTypeHandler
 		L2PcInstance player = activeChar.getActingPlayer();
 		if (activeChar.isSummon())
 		{
-			if (L2Skill.addCharacter(activeChar, player, radius, false))
+			if (Skill.addCharacter(activeChar, player, radius, false))
 			{
 				targetList.add(player);
 			}
 		}
 		else if (activeChar.isPlayer())
 		{
-			if (L2Skill.addSummon(activeChar, player, radius, false))
+			if (Skill.addSummon(activeChar, player, radius, false))
 			{
 				targetList.add(player.getSummon());
 			}
@@ -74,12 +74,12 @@ public class Party implements ITargetTypeHandler
 					continue;
 				}
 				
-				if (L2Skill.addCharacter(activeChar, partyMember, radius, false))
+				if (Skill.addCharacter(activeChar, partyMember, radius, false))
 				{
 					targetList.add(partyMember);
 				}
 				
-				if (L2Skill.addSummon(activeChar, partyMember, radius, false))
+				if (Skill.addSummon(activeChar, partyMember, radius, false))
 				{
 					targetList.add(partyMember.getSummon());
 				}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/PartyClan.java

@@ -27,7 +27,7 @@ import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 
 /**
@@ -36,7 +36,7 @@ import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 public class PartyClan implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new ArrayList<>();
 		if (onlyFirst)
@@ -60,7 +60,7 @@ public class PartyClan implements ITargetTypeHandler
 		final boolean hasClan = player.getClan() != null;
 		final boolean hasParty = player.isInParty();
 		
-		if (L2Skill.addSummon(activeChar, player, radius, false))
+		if (Skill.addSummon(activeChar, player, radius, false))
 		{
 			targetList.add(player.getSummon());
 		}
@@ -128,12 +128,12 @@ public class PartyClan implements ITargetTypeHandler
 				continue;
 			}
 			
-			if (!onlyFirst && L2Skill.addSummon(activeChar, obj, radius, false))
+			if (!onlyFirst && Skill.addSummon(activeChar, obj, radius, false))
 			{
 				targetList.add(obj.getSummon());
 			}
 			
-			if (!L2Skill.addCharacter(activeChar, obj, radius, false))
+			if (!Skill.addCharacter(activeChar, obj, radius, false))
 			{
 				continue;
 			}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/PartyMember.java

@@ -21,7 +21,7 @@ package handlers.targethandlers;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
@@ -31,7 +31,7 @@ import com.l2jserver.gameserver.network.SystemMessageId;
 public class PartyMember implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		if (target == null)
 		{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/PartyNotMe.java

@@ -26,7 +26,7 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.util.Util;
 
@@ -36,7 +36,7 @@ import com.l2jserver.gameserver.util.Util;
 public class PartyNotMe implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		final List<L2Character> targetList = new ArrayList<>();
 		if (activeChar.getParty() != null)

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/PartyOther.java

@@ -21,7 +21,7 @@ package handlers.targethandlers;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
@@ -31,7 +31,7 @@ import com.l2jserver.gameserver.network.SystemMessageId;
 public class PartyOther implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		if ((target != null) && (target != activeChar) && activeChar.isInParty() && target.isInParty() && (activeChar.getParty().getLeaderObjectId() == target.getParty().getLeaderObjectId()))
 		{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/PcBody.java

@@ -27,7 +27,7 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
 import com.l2jserver.gameserver.model.effects.L2EffectType;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -38,7 +38,7 @@ import com.l2jserver.gameserver.network.SystemMessageId;
 public class PcBody implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new ArrayList<>();
 		if ((target != null) && target.isDead())

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/Pet.java

@@ -21,7 +21,7 @@ package handlers.targethandlers;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 
 /**
@@ -31,7 +31,7 @@ import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 public class Pet implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		if (activeChar.hasPet())
 		{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/Self.java

@@ -21,7 +21,7 @@ package handlers.targethandlers;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 
 /**
@@ -31,7 +31,7 @@ public class Self implements ITargetTypeHandler
 {
 	
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		return new L2Character[]
 		{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/Servitor.java

@@ -21,7 +21,7 @@ package handlers.targethandlers;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 
 /**
@@ -31,7 +31,7 @@ import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 public class Servitor implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		if (activeChar.hasServitor())
 		{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/Summon.java

@@ -21,7 +21,7 @@ package handlers.targethandlers;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 
 /**
@@ -31,7 +31,7 @@ import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 public class Summon implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		if (activeChar.hasSummon())
 		{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/Unlockable.java

@@ -22,7 +22,7 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2ChestInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 
 /**
@@ -31,7 +31,7 @@ import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 public class Unlockable implements ITargetTypeHandler
 {
 	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		if ((target == null) || (!target.isDoor() && !(target instanceof L2ChestInstance)))
 		{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/ReloadHandler.java

@@ -29,7 +29,7 @@ import com.l2jserver.gameserver.cache.HtmCache;
 import com.l2jserver.gameserver.datatables.ItemTable;
 import com.l2jserver.gameserver.datatables.MultisellData;
 import com.l2jserver.gameserver.datatables.NpcData;
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.datatables.SpawnTable;
 import com.l2jserver.gameserver.datatables.TeleportLocationTable;
 import com.l2jserver.gameserver.handler.ITelnetHandler;
@@ -69,7 +69,7 @@ public class ReloadHandler implements ITelnetHandler
 				else if (type.equals("skill"))
 				{
 					_print.print("Reloading skills... ");
-					SkillTable.getInstance().reload();
+					SkillData.getInstance().reload();
 					_print.println("done");
 				}
 				else if (type.equals("npc"))

L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java

@@ -22,12 +22,12 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.GameTimeController;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.handler.IUserCommandHandler;
 import com.l2jserver.gameserver.model.TeleportWhereType;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 import com.l2jserver.gameserver.network.serverpackets.SetupGauge;
@@ -66,8 +66,8 @@ public class Unstuck implements IUserCommandHandler
 		}
 		activeChar.forceIsCasting(GameTimeController.getInstance().getGameTicks() + (unstuckTimer / GameTimeController.MILLIS_IN_TICK));
 		
-		L2Skill escape = SkillTable.getInstance().getInfo(2099, 1); // 5 minutes escape
-		L2Skill GM_escape = SkillTable.getInstance().getInfo(2100, 1); // 1 second escape
+		Skill escape = SkillData.getInstance().getSkill(2099, 1); // 5 minutes escape
+		Skill GM_escape = SkillData.getInstance().getSkill(2100, 1); // 1 second escape
 		if (activeChar.getAccessLevel().isGm())
 		{
 			if (GM_escape != null)

L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java

@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.GameTimeController;
 import com.l2jserver.gameserver.SevenSigns;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.enums.PlayerAction;
 import com.l2jserver.gameserver.handler.IVoicedCommandHandler;
 import com.l2jserver.gameserver.instancemanager.CoupleManager;
@@ -42,7 +42,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.L2Event;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
 import com.l2jserver.gameserver.model.skills.AbnormalVisualEffect;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
@@ -171,7 +171,7 @@ public class Wedding implements IVoicedCommandHandler
 					skillId = 4361;
 				}
 				
-				final L2Skill skill = SkillTable.getInstance().getInfo(skillId, skillLevel);
+				final Skill skill = SkillData.getInstance().getSkill(skillId, skillLevel);
 				if (!activeChar.isAffectedBySkill(skillId))
 				{
 					skill.applyEffects(activeChar, activeChar);

L2J_DataPack_BETA/dist/game/data/scripts/hellbound/AnomicFoundry/AnomicFoundry.java

@@ -32,7 +32,7 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
 import com.l2jserver.gameserver.network.serverpackets.NpcSay;
@@ -177,7 +177,7 @@ public class AnomicFoundry extends Quest
 	}
 	
 	@Override
-	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, L2Skill skill)
+	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, Skill skill)
 	{
 		int atkIndex = _atkIndex.containsKey(npc.getObjectId()) ? _atkIndex.get(npc.getObjectId()) : 0;
 		if (atkIndex == 0)

L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TowerOfNaia/TowerOfNaia.java

@@ -30,7 +30,7 @@ import javolution.util.FastMap;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.datatables.DoorTable;
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.instancemanager.GlobalVariablesManager;
 import com.l2jserver.gameserver.instancemanager.ZoneManager;
 import com.l2jserver.gameserver.model.L2Party;
@@ -39,7 +39,7 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -988,7 +988,7 @@ public class TowerOfNaia extends Quest
 				cancelQuestTimers("spawn_lock");
 				startQuestTimer("spawn_lock", 300000, null, null);
 				npc.setTarget(player);
-				npc.doCast(SkillTable.getInstance().getInfo(5527, 1));
+				npc.doCast(SkillData.getInstance().getSkill(5527, 1));
 			}
 		}
 		else if (event.equalsIgnoreCase("teleport") && (_lock != null))
@@ -1014,7 +1014,7 @@ public class TowerOfNaia extends Quest
 				else
 				{
 					npc.setTarget(player);
-					npc.doCast(SkillTable.getInstance().getInfo(5527, 1));
+					npc.doCast(SkillData.getInstance().getSkill(5527, 1));
 				}
 			}
 			else
@@ -1047,7 +1047,7 @@ public class TowerOfNaia extends Quest
 	}
 	
 	@Override
-	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, L2Skill skill)
+	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, Skill skill)
 	{
 		if ((_lock != null) && (npc.getObjectId() == _lock.getObjectId()))
 		{

L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TullyWorkshop/TullyWorkshop.java

@@ -31,7 +31,7 @@ import javolution.util.FastMap;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.datatables.DoorTable;
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.instancemanager.RaidBossSpawnManager;
 import com.l2jserver.gameserver.instancemanager.RaidBossSpawnManager.StatusEnum;
 import com.l2jserver.gameserver.instancemanager.ZoneManager;
@@ -43,7 +43,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
 import com.l2jserver.gameserver.model.quest.Quest;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -1353,7 +1353,7 @@ public class TullyWorkshop extends Quest
 					{
 						npc.setTarget(player);
 					}
-					npc.doCast(SkillTable.getInstance().getInfo(5526, 1));
+					npc.doCast(SkillData.getInstance().getSkill(5526, 1));
 				}
 				else
 				{
@@ -1368,7 +1368,7 @@ public class TullyWorkshop extends Quest
 					for (L2PcInstance partyMember : party.getMembers())
 					{
 						npc.setTarget(partyMember);
-						npc.doCast(SkillTable.getInstance().getInfo(5526, 1));
+						npc.doCast(SkillData.getInstance().getSkill(5526, 1));
 					}
 					startQuestTimer("despawn_agent_7", 60000, npc, null);
 				}
@@ -1475,7 +1475,7 @@ public class TullyWorkshop extends Quest
 	}
 	
 	@Override
-	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, L2Skill skill)
+	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, Skill skill)
 	{
 		final int npcId = npc.getId();
 		if (Arrays.binarySearch(TELEPORTING_MONSTERS, npcId) >= 0)
@@ -1525,7 +1525,7 @@ public class TullyWorkshop extends Quest
 				actor.clearAggroList();
 				actor.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
 				actor.setTarget(victim);
-				actor.doCast(SkillTable.getInstance().getInfo(4065, 11));
+				actor.doCast(SkillData.getInstance().getSkill(4065, 11));
 				victim.setCurrentHp(victim.getCurrentHp() + (victim.getMaxHp() * 0.03)); // FIXME: not retail, it should be done after spell is finished, but it cannot be tracked now
 			}
 		}
@@ -1749,7 +1749,7 @@ public class TullyWorkshop extends Quest
 	}
 	
 	@Override
-	public String onSpellFinished(L2Npc npc, L2PcInstance player, L2Skill skill)
+	public String onSpellFinished(L2Npc npc, L2PcInstance player, Skill skill)
 	{
 		final int npcId = npc.getId();
 		final int skillId = skill.getId();

L2J_DataPack_BETA/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java

@@ -37,7 +37,7 @@ import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.instancezone.InstanceWorld;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
@@ -563,7 +563,7 @@ public abstract class Chamber extends Quest
 	}
 	
 	@Override
-	public String onAttack(final L2Npc npc, final L2PcInstance attacker, final int damage, final boolean isPet, final L2Skill skill)
+	public String onAttack(final L2Npc npc, final L2PcInstance attacker, final int damage, final boolean isPet, final Skill skill)
 	{
 		if (!npc.isBusy() && (npc.getCurrentHp() < (npc.getMaxHp() / 10)))
 		{
@@ -647,7 +647,7 @@ public abstract class Chamber extends Quest
 	}
 	
 	@Override
-	public String onSpellFinished(L2Npc npc, L2PcInstance player, L2Skill skill)
+	public String onSpellFinished(L2Npc npc, L2PcInstance player, Skill skill)
 	{
 		if ((npc.getId() == BOX) && ((skill.getId() == 5376) || (skill.getId() == 5758)) && !npc.isDead())
 		{

L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java

@@ -27,7 +27,7 @@ import javolution.util.FastMap;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.GeoData;
 import com.l2jserver.gameserver.ai.CtrlIntention;
-import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.enums.TrapAction;
 import com.l2jserver.gameserver.instancemanager.InstanceManager;
 import com.l2jserver.gameserver.model.L2Object;
@@ -46,7 +46,7 @@ import com.l2jserver.gameserver.model.instancezone.InstanceWorld;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
 import com.l2jserver.gameserver.network.NpcStringId;
@@ -1916,7 +1916,7 @@ public final class CrystalCaverns extends Quest
 	}
 	
 	@Override
-	public String onSkillSee(L2Npc npc, L2PcInstance caster, L2Skill skill, L2Object[] targets, boolean isSummon)
+	public String onSkillSee(L2Npc npc, L2PcInstance caster, Skill skill, L2Object[] targets, boolean isSummon)
 	{
 		
 		boolean doReturn = true;
@@ -2027,7 +2027,7 @@ public final class CrystalCaverns extends Quest
 	}
 	
 	@Override
-	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, L2Skill skill)
+	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, Skill skill)
 	{
 		if (npc.getId() == TEARS)
 		{
@@ -2106,7 +2106,7 @@ public final class CrystalCaverns extends Quest
 	}
 	
 	@Override
-	public String onSpellFinished(L2Npc npc, L2PcInstance player, L2Skill skill)
+	public String onSpellFinished(L2Npc npc, L2PcInstance player, Skill skill)
 	{
 		if ((npc.getId() == BAYLOR) && (skill.getId() == 5225))
 		{
@@ -2140,7 +2140,7 @@ public final class CrystalCaverns extends Quest
 				{
 					teleportPlayer(player, new Location(144653, 152606, -12126), world.getInstanceId());
 					player.stopSkillEffects(true, 5239);
-					SkillTable.getInstance().getInfo(5239, 1).applyEffects(player, player);
+					SkillData.getInstance().getSkill(5239, 1).applyEffects(player, player);
 					startQuestTimer("Timer2", 300000, npc, player);
 				}
 			}
@@ -2289,8 +2289,8 @@ public final class CrystalCaverns extends Quest
 				if (world._alarm == null)
 				{
 					int[] spawnLoc = ALARMSPAWN[getRandom(ALARMSPAWN.length)];
-					npc.addSkill(SkillTable.getInstance().getInfo(5244, 1));
-					npc.addSkill(SkillTable.getInstance().getInfo(5245, 1));
+					npc.addSkill(SkillData.getInstance().getSkill(5244, 1));
+					npc.addSkill(SkillData.getInstance().getSkill(5245, 1));
 					world._alarm = addSpawn(ALARMID, spawnLoc[0], spawnLoc[1], spawnLoc[2], 10800, false, 0, false, world.getInstanceId());
 					world._alarm.disableCoreAI(true);
 					world._alarm.setIsImmobilized(true);
@@ -2313,24 +2313,24 @@ public final class CrystalCaverns extends Quest
 					{
 						if ((nowHp < (maxHp * 0.15)) && (world._raidStatus == 2))
 						{
-							npc.doCast(SkillTable.getInstance().getInfo(5225, 1));
+							npc.doCast(SkillData.getInstance().getSkill(5225, 1));
 							npc.broadcastPacket(new CreatureSay(npc.getObjectId(), 1, npc.getName(), NpcStringId.DEMON_KING_BELETH_GIVE_ME_THE_POWER_AAAHH));
 						}
 						else if ((rand < 10) || (nowHp < (maxHp * 0.15)))
 						{
-							npc.doCast(SkillTable.getInstance().getInfo(5225, 1));
+							npc.doCast(SkillData.getInstance().getSkill(5225, 1));
 							npc.broadcastPacket(new CreatureSay(npc.getObjectId(), 1, npc.getName(), NpcStringId.DEMON_KING_BELETH_GIVE_ME_THE_POWER_AAAHH));
 							startQuestTimer("baylor_remove_invul", 30000, world._baylor, null);
 						}
 					}
 					else if ((nowHp < (maxHp * 0.3)) && (rand > 50) && !npc.isAffectedBySkill(5225) && !npc.isAffectedBySkill(5224))
 					{
-						npc.doCast(SkillTable.getInstance().getInfo(5224, 1));
+						npc.doCast(SkillData.getInstance().getSkill(5224, 1));
 					}
 					else if (rand < 33)
 					{
 						npc.setTarget(world._raiders.get(getRandom(world._raiders.size())));
-						npc.doCast(SkillTable.getInstance().getInfo(5229, 1));
+						npc.doCast(SkillData.getInstance().getSkill(5229, 1));
 					}
 				}
 			}
@@ -2573,14 +2573,14 @@ public final class CrystalCaverns extends Quest
 						{
 							if (partyMember.getInstanceId() == world.getInstanceId())
 							{
-								SkillTable.getInstance().getInfo(5239, 1).applyEffects(partyMember, partyMember);
+								SkillData.getInstance().getSkill(5239, 1).applyEffects(partyMember, partyMember);
 								startQuestTimer("Timer2", 300000, npc, partyMember);
 							}
 						}
 					}
 					else
 					{
-						SkillTable.getInstance().getInfo(5239, 1).applyEffects(player, player);
+						SkillData.getInstance().getSkill(5239, 1).applyEffects(player, player);
 						startQuestTimer("Timer2", 300000, npc, player);
 					}
 					startQuestTimer("Timer21", 300000, npc, null);
@@ -2799,7 +2799,7 @@ public final class CrystalCaverns extends Quest
 								if (partyMember.getInstanceId() == world.getInstanceId())
 								{
 									partyMember.stopSkillEffects(true, 5239);
-									SkillTable.getInstance().getInfo(5239, 2).applyEffects(partyMember, partyMember);
+									SkillData.getInstance().getSkill(5239, 2).applyEffects(partyMember, partyMember);
 									startQuestTimer("Timer3", 600000, npc, partyMember);
 								}
 							}
@@ -2807,7 +2807,7 @@ public final class CrystalCaverns extends Quest
 						else
 						{
 							player.stopSkillEffects(true, 5239);
-							SkillTable.getInstance().getInfo(5239, 2).applyEffects(player, player);
+							SkillData.getInstance().getSkill(5239, 2).applyEffects(player, player);
 							startQuestTimer("Timer3", 600000, npc, player);
 						}
 						startQuestTimer("Timer31", 600000, npc, null);
@@ -2827,7 +2827,7 @@ public final class CrystalCaverns extends Quest
 								if (partyMember.getInstanceId() == world.getInstanceId())
 								{
 									partyMember.stopSkillEffects(true, 5239);
-									SkillTable.getInstance().getInfo(5239, 4).applyEffects(partyMember, partyMember);
+									SkillData.getInstance().getSkill(5239, 4).applyEffects(partyMember, partyMember);
 									startQuestTimer("Timer4", 1200000, npc, partyMember);
 								}
 							}
@@ -2835,7 +2835,7 @@ public final class CrystalCaverns extends Quest
 						else
 						{
 							player.stopSkillEffects(true, 5239);
-							SkillTable.getInstance().getInfo(5239, 4).applyEffects(player, player);
+							SkillData.getInstance().getSkill(5239, 4).applyEffects(player, player);
 							startQuestTimer("Timer4", 1200000, npc, player);
 						}
 						startQuestTimer("Timer41", 1200000, npc, null);
@@ -2855,7 +2855,7 @@ public final class CrystalCaverns extends Quest
 								if (partyMember.getInstanceId() == world.getInstanceId())
 								{
 									partyMember.stopSkillEffects(true, 5239);
-									SkillTable.getInstance().getInfo(5239, 3).applyEffects(partyMember, partyMember);
+									SkillData.getInstance().getSkill(5239, 3).applyEffects(partyMember, partyMember);
 									startQuestTimer("Timer5", 900000, npc, partyMember);
 								}
 							}
@@ -2863,7 +2863,7 @@ public final class CrystalCaverns extends Quest
 						else
 						{
 							player.stopSkillEffects(true, 5239);
-							SkillTable.getInstance().getInfo(5239, 3).applyEffects(player, player);
+							SkillData.getInstance().getSkill(5239, 3).applyEffects(player, player);
 							startQuestTimer("Timer5", 900000, npc, player);
 						}
 						startQuestTimer("Timer51", 900000, npc, null);