Moved skills in model.

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/RecipeController.java

@@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.actor.instance.RecipeInstance;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
+import org.l2jmobius.gameserver.model.skills.Stats;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import org.l2jmobius.gameserver.network.serverpackets.ItemList;
@@ -45,7 +46,6 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeShopItemInfo;
 import org.l2jmobius.gameserver.network.serverpackets.SetupGauge;
 import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.skills.Stats;
 import org.l2jmobius.gameserver.util.Util;
 
 public class RecipeController

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/NpcTable.java

@@ -36,8 +36,8 @@ import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.StatsSet;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
 import org.l2jmobius.gameserver.model.base.ClassId;
-import org.l2jmobius.gameserver.skills.BaseStats;
+import org.l2jmobius.gameserver.model.skills.BaseStats;
-import org.l2jmobius.gameserver.skills.Stats;
+import org.l2jmobius.gameserver.model.skills.Stats;
 
 /**
  * @version $Revision: 1.8.2.6.2.9 $ $Date: 2005/04/06 16:13:25 $

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/SkillTreeTable.java

@@ -35,8 +35,8 @@ import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.SkillLearn;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.base.ClassId;
-import org.l2jmobius.gameserver.skills.holders.ISkillsHolder;
+import org.l2jmobius.gameserver.model.skills.holders.ISkillsHolder;
-import org.l2jmobius.gameserver.skills.holders.PlayerSkillHolder;
+import org.l2jmobius.gameserver.model.skills.holders.PlayerSkillHolder;
 
 /**
  * @version $Revision: 1.13.2.2.2.8 $ $Date: 2005/04/06 16:13:25 $

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/AugmentationData.java

@@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.datatables.SkillTable;
 import org.l2jmobius.gameserver.model.Augmentation;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
-import org.l2jmobius.gameserver.skills.Stats;
+import org.l2jmobius.gameserver.model.skills.Stats;
 
 /**
  * This class manages the augmentation data and can also create new augmentations.

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java

@@ -41,41 +41,41 @@ import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.items.Weapon;
 import org.l2jmobius.gameserver.model.items.type.ArmorType;
 import org.l2jmobius.gameserver.model.items.type.WeaponType;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
-import org.l2jmobius.gameserver.skills.Stats;
+import org.l2jmobius.gameserver.model.skills.Stats;
-import org.l2jmobius.gameserver.skills.conditions.Condition;
+import org.l2jmobius.gameserver.model.skills.conditions.Condition;
-import org.l2jmobius.gameserver.skills.conditions.ConditionElementSeed;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionElementSeed;
-import org.l2jmobius.gameserver.skills.conditions.ConditionForceBuff;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionForceBuff;
-import org.l2jmobius.gameserver.skills.conditions.ConditionGameChance;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionGameChance;
-import org.l2jmobius.gameserver.skills.conditions.ConditionGameTime;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionGameTime;
-import org.l2jmobius.gameserver.skills.conditions.ConditionGameTime.CheckGameTime;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionGameTime.CheckGameTime;
-import org.l2jmobius.gameserver.skills.conditions.ConditionLogicAnd;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionLogicAnd;
-import org.l2jmobius.gameserver.skills.conditions.ConditionLogicNot;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionLogicNot;
-import org.l2jmobius.gameserver.skills.conditions.ConditionLogicOr;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionLogicOr;
-import org.l2jmobius.gameserver.skills.conditions.ConditionPlayerClassIdRestriction;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionPlayerClassIdRestriction;
-import org.l2jmobius.gameserver.skills.conditions.ConditionPlayerHp;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionPlayerHp;
-import org.l2jmobius.gameserver.skills.conditions.ConditionPlayerHpPercentage;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionPlayerHpPercentage;
-import org.l2jmobius.gameserver.skills.conditions.ConditionPlayerLevel;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionPlayerLevel;
-import org.l2jmobius.gameserver.skills.conditions.ConditionPlayerMp;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionPlayerMp;
-import org.l2jmobius.gameserver.skills.conditions.ConditionPlayerRace;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionPlayerRace;
-import org.l2jmobius.gameserver.skills.conditions.ConditionPlayerState;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionPlayerState;
-import org.l2jmobius.gameserver.skills.conditions.ConditionPlayerState.CheckPlayerState;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionPlayerState.CheckPlayerState;
-import org.l2jmobius.gameserver.skills.conditions.ConditionSkillStats;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionSkillStats;
-import org.l2jmobius.gameserver.skills.conditions.ConditionSlotItemId;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionSlotItemId;
-import org.l2jmobius.gameserver.skills.conditions.ConditionTargetAggro;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionTargetAggro;
-import org.l2jmobius.gameserver.skills.conditions.ConditionTargetClassIdRestriction;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionTargetClassIdRestriction;
-import org.l2jmobius.gameserver.skills.conditions.ConditionTargetLevel;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionTargetLevel;
-import org.l2jmobius.gameserver.skills.conditions.ConditionTargetRaceId;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionTargetRaceId;
-import org.l2jmobius.gameserver.skills.conditions.ConditionTargetUsesWeaponKind;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionTargetUsesWeaponKind;
-import org.l2jmobius.gameserver.skills.conditions.ConditionUsingItemType;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionUsingItemType;
-import org.l2jmobius.gameserver.skills.conditions.ConditionUsingSkill;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionUsingSkill;
-import org.l2jmobius.gameserver.skills.conditions.ConditionWithSkill;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionWithSkill;
-import org.l2jmobius.gameserver.skills.effects.EffectTemplate;
+import org.l2jmobius.gameserver.model.skills.effects.EffectTemplate;
-import org.l2jmobius.gameserver.skills.funcs.FuncTemplate;
+import org.l2jmobius.gameserver.model.skills.funcs.FuncTemplate;
-import org.l2jmobius.gameserver.skills.funcs.Lambda;
+import org.l2jmobius.gameserver.model.skills.funcs.Lambda;
-import org.l2jmobius.gameserver.skills.funcs.LambdaCalc;
+import org.l2jmobius.gameserver.model.skills.funcs.LambdaCalc;
-import org.l2jmobius.gameserver.skills.funcs.LambdaConst;
+import org.l2jmobius.gameserver.model.skills.funcs.LambdaConst;
-import org.l2jmobius.gameserver.skills.funcs.LambdaStats;
+import org.l2jmobius.gameserver.model.skills.funcs.LambdaStats;
 
 /**
  * @author mkizub

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentSkill.java

@@ -27,7 +27,7 @@ import org.w3c.dom.Node;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.Skill.SkillType;
 import org.l2jmobius.gameserver.model.StatsSet;
-import org.l2jmobius.gameserver.skills.conditions.Condition;
+import org.l2jmobius.gameserver.model.skills.conditions.Condition;
 
 /**
  * @author mkizub

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminFightCalculator.java

@@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
+import org.l2jmobius.gameserver.model.skills.Formulas;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import org.l2jmobius.gameserver.skills.Formulas;
 
 /**
  * This class handles following admin commands: - gm = turns gm mode on/off

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java

@@ -23,13 +23,13 @@ import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
+import org.l2jmobius.gameserver.model.skills.effects.EffectCharge;
+import org.l2jmobius.gameserver.model.skills.handlers.SkillCharge;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.skills.effects.EffectCharge;
-import org.l2jmobius.gameserver.skills.handlers.SkillCharge;
 
 public class EnergyStone implements IItemHandler
 {

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulShots.java

@@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.items.Weapon;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
+import org.l2jmobius.gameserver.model.skills.Stats;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot;
 import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.skills.Stats;
 import org.l2jmobius.gameserver.util.Broadcast;
 
 public class SoulShots implements IItemHandler

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java

@@ -30,12 +30,12 @@ import org.l2jmobius.gameserver.model.actor.instance.SummonInstance;
 import org.l2jmobius.gameserver.model.entity.olympiad.Olympiad;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.WeaponType;
+import org.l2jmobius.gameserver.model.skills.BaseStats;
+import org.l2jmobius.gameserver.model.skills.Formulas;
+import org.l2jmobius.gameserver.model.skills.Stats;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.PlaySound;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.skills.BaseStats;
-import org.l2jmobius.gameserver.skills.Formulas;
-import org.l2jmobius.gameserver.skills.Stats;
 import org.l2jmobius.gameserver.util.Util;
 
 /**

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java

@@ -36,9 +36,9 @@ import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.DoorInstance;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.skills.Formulas;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.skills.Formulas;
 
 public class Continuous implements ISkillHandler
 {

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/CpDam.java

@@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.skills.Formulas;
+import org.l2jmobius.gameserver.model.skills.Formulas;
 
 /**
  * Just a quick draft to support Wrath skill. Missing angle based calculation etc.

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Disablers.java

@@ -38,10 +38,10 @@ import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.actor.instance.SiegeSummonInstance;
+import org.l2jmobius.gameserver.model.skills.Formulas;
+import org.l2jmobius.gameserver.model.skills.Stats;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.skills.Formulas;
-import org.l2jmobius.gameserver.skills.Stats;
 
 /**
  * This Handles Disabler skills

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Heal.java

@@ -28,10 +28,10 @@ import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.actor.instance.RaidBossInstance;
+import org.l2jmobius.gameserver.model.skills.Stats;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.skills.Stats;
 
 public class Heal implements ISkillHandler
 {

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ManaHeal.java

@@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.Skill.SkillType;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.skills.Stats;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.skills.Stats;
 
 public class ManaHeal implements ISkillHandler
 {

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Manadam.java

@@ -24,10 +24,10 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.skills.Formulas;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.skills.Formulas;
 
 /**
  * Class handling the Mana damage skill

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Mdam.java

@@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.skills.Formulas;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.skills.Formulas;
 
 public class Mdam implements ISkillHandler
 {

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java

@@ -34,12 +34,12 @@ import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.WeaponType;
+import org.l2jmobius.gameserver.model.skills.BaseStats;
+import org.l2jmobius.gameserver.model.skills.Formulas;
+import org.l2jmobius.gameserver.model.skills.effects.EffectCharge;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.skills.BaseStats;
-import org.l2jmobius.gameserver.skills.Formulas;
-import org.l2jmobius.gameserver.skills.effects.EffectCharge;
 
 public class Pdam implements ISkillHandler
 {

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Resurrect.java

@@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.skills.Formulas;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.skills.Formulas;
 import org.l2jmobius.gameserver.taskmanager.DecayTaskManager;
 
 public class Resurrect implements ISkillHandler

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Spoil.java

@@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.skills.Formulas;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.skills.Formulas;
 
 /**
  * @author _drunk_ TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/StrSiegeAssault.java

@@ -29,9 +29,9 @@ import org.l2jmobius.gameserver.model.entity.siege.Castle;
 import org.l2jmobius.gameserver.model.entity.siege.Fort;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.WeaponType;
+import org.l2jmobius.gameserver.model.skills.Formulas;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.skills.Formulas;
 
 /**
  * @author _tomciaaa_

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Unlock.java

@@ -25,11 +25,11 @@ import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.ChestInstance;
 import org.l2jmobius.gameserver.model.actor.instance.DoorInstance;
+import org.l2jmobius.gameserver.model.skills.Formulas;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.skills.Formulas;
 
 public class Unlock implements ISkillHandler
 {

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java

@@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.StatsSet;
 import org.l2jmobius.gameserver.model.actor.instance.RaidBossInstance;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
 import org.l2jmobius.gameserver.model.entity.Announcements;
+import org.l2jmobius.gameserver.model.skills.Stats;
 import org.l2jmobius.gameserver.model.spawn.Spawn;
-import org.l2jmobius.gameserver.skills.Stats;
 
 /**
  * Raid Boss spawn manager.

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Augmentation.java

@@ -27,9 +27,9 @@ import org.l2jmobius.gameserver.datatables.SkillTable;
 import org.l2jmobius.gameserver.datatables.xml.AugmentationData;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
-import org.l2jmobius.gameserver.skills.Stats;
+import org.l2jmobius.gameserver.model.skills.Stats;
-import org.l2jmobius.gameserver.skills.funcs.FuncAdd;
+import org.l2jmobius.gameserver.model.skills.funcs.FuncAdd;
-import org.l2jmobius.gameserver.skills.funcs.LambdaConst;
+import org.l2jmobius.gameserver.model.skills.funcs.LambdaConst;
 
 /**
  * Used to store an augmentation and its bonus

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ChanceSkillList.java

@@ -21,9 +21,9 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.gameserver.handler.ISkillHandler;
 import org.l2jmobius.gameserver.handler.SkillHandler;
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.skills.Formulas;
 import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched;
 import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
-import org.l2jmobius.gameserver.skills.Formulas;
 
 /**
  * @author kombat

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Effect.java

@@ -27,16 +27,16 @@ import org.l2jmobius.gameserver.GameTimeController;
 import org.l2jmobius.gameserver.model.Skill.SkillType;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.skills.Env;
+import org.l2jmobius.gameserver.model.skills.effects.EffectTemplate;
+import org.l2jmobius.gameserver.model.skills.funcs.Func;
+import org.l2jmobius.gameserver.model.skills.funcs.FuncTemplate;
+import org.l2jmobius.gameserver.model.skills.funcs.Lambda;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadSpelledInfo;
 import org.l2jmobius.gameserver.network.serverpackets.MagicEffectIcons;
 import org.l2jmobius.gameserver.network.serverpackets.PartySpelled;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.skills.Env;
-import org.l2jmobius.gameserver.skills.effects.EffectTemplate;
-import org.l2jmobius.gameserver.skills.funcs.Func;
-import org.l2jmobius.gameserver.skills.funcs.FuncTemplate;
-import org.l2jmobius.gameserver.skills.funcs.Lambda;
 
 public abstract class Effect
 {

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ForceBuff.java

@@ -20,7 +20,7 @@ import java.util.logging.Logger;
 
 import org.l2jmobius.gameserver.datatables.SkillTable;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.skills.effects.EffectForce;
+import org.l2jmobius.gameserver.model.skills.effects.EffectForce;
 
 /**
  * @author kombat

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Party.java

@@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.instance.SummonInstance;
 import org.l2jmobius.gameserver.model.entity.DimensionalRift;
 import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSignsFestival;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
+import org.l2jmobius.gameserver.model.skills.Stats;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
 import org.l2jmobius.gameserver.network.serverpackets.ExCloseMPCC;
@@ -47,7 +48,6 @@ import org.l2jmobius.gameserver.network.serverpackets.PartySmallWindowAll;
 import org.l2jmobius.gameserver.network.serverpackets.PartySmallWindowDelete;
 import org.l2jmobius.gameserver.network.serverpackets.PartySmallWindowDeleteAll;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.skills.Stats;
 import org.l2jmobius.gameserver.util.Util;
 
 /**

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java

@@ -49,29 +49,29 @@ import org.l2jmobius.gameserver.model.entity.event.CTF;
 import org.l2jmobius.gameserver.model.entity.event.DM;
 import org.l2jmobius.gameserver.model.entity.event.TvT;
 import org.l2jmobius.gameserver.model.entity.siege.Siege;
+import org.l2jmobius.gameserver.model.skills.BaseStats;
+import org.l2jmobius.gameserver.model.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Formulas;
+import org.l2jmobius.gameserver.model.skills.Stats;
+import org.l2jmobius.gameserver.model.skills.conditions.Condition;
+import org.l2jmobius.gameserver.model.skills.effects.EffectCharge;
+import org.l2jmobius.gameserver.model.skills.effects.EffectTemplate;
+import org.l2jmobius.gameserver.model.skills.funcs.Func;
+import org.l2jmobius.gameserver.model.skills.funcs.FuncTemplate;
+import org.l2jmobius.gameserver.model.skills.handlers.SkillCharge;
+import org.l2jmobius.gameserver.model.skills.handlers.SkillChargeDmg;
+import org.l2jmobius.gameserver.model.skills.handlers.SkillChargeEffect;
+import org.l2jmobius.gameserver.model.skills.handlers.SkillCreateItem;
+import org.l2jmobius.gameserver.model.skills.handlers.SkillDefault;
+import org.l2jmobius.gameserver.model.skills.handlers.SkillDrain;
+import org.l2jmobius.gameserver.model.skills.handlers.SkillSeed;
+import org.l2jmobius.gameserver.model.skills.handlers.SkillSignet;
+import org.l2jmobius.gameserver.model.skills.handlers.SkillSignetCasttime;
+import org.l2jmobius.gameserver.model.skills.handlers.SkillSummon;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.skills.BaseStats;
-import org.l2jmobius.gameserver.skills.Env;
-import org.l2jmobius.gameserver.skills.Formulas;
-import org.l2jmobius.gameserver.skills.Stats;
-import org.l2jmobius.gameserver.skills.conditions.Condition;
-import org.l2jmobius.gameserver.skills.effects.EffectCharge;
-import org.l2jmobius.gameserver.skills.effects.EffectTemplate;
-import org.l2jmobius.gameserver.skills.funcs.Func;
-import org.l2jmobius.gameserver.skills.funcs.FuncTemplate;
-import org.l2jmobius.gameserver.skills.handlers.SkillCharge;
-import org.l2jmobius.gameserver.skills.handlers.SkillChargeDmg;
-import org.l2jmobius.gameserver.skills.handlers.SkillChargeEffect;
-import org.l2jmobius.gameserver.skills.handlers.SkillCreateItem;
-import org.l2jmobius.gameserver.skills.handlers.SkillDefault;
-import org.l2jmobius.gameserver.skills.handlers.SkillDrain;
-import org.l2jmobius.gameserver.skills.handlers.SkillSeed;
-import org.l2jmobius.gameserver.skills.handlers.SkillSignet;
-import org.l2jmobius.gameserver.skills.handlers.SkillSignetCasttime;
-import org.l2jmobius.gameserver.skills.handlers.SkillSummon;
 import org.l2jmobius.gameserver.util.Util;
 
 public abstract class Skill

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/StatsSet.java

@@ -30,7 +30,7 @@ import java.util.stream.Collectors;
 
 import org.l2jmobius.commons.util.TimeUtil;
 import org.l2jmobius.gameserver.model.interfaces.IParserAdvUtils;
-import org.l2jmobius.gameserver.skills.holders.SkillHolder;
+import org.l2jmobius.gameserver.model.skills.holders.SkillHolder;
 import org.l2jmobius.gameserver.util.Util;
 
 /**

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -57,6 +57,7 @@ import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
 import org.l2jmobius.gameserver.model.quest.Quest;
+import org.l2jmobius.gameserver.model.skills.Stats;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.clientpackets.Say2;
 import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -64,7 +65,6 @@ import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.script.EventDroplist;
 import org.l2jmobius.gameserver.script.EventDroplist.DateDrop;
-import org.l2jmobius.gameserver.skills.Stats;
 import org.l2jmobius.gameserver.util.Util;
 
 /**

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -99,6 +99,12 @@ import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.WeaponType;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.skills.Calculator;
+import org.l2jmobius.gameserver.model.skills.Formulas;
+import org.l2jmobius.gameserver.model.skills.Stats;
+import org.l2jmobius.gameserver.model.skills.effects.EffectCharge;
+import org.l2jmobius.gameserver.model.skills.funcs.Func;
+import org.l2jmobius.gameserver.model.skills.holders.ISkillsHolder;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.model.zone.type.BossZone;
 import org.l2jmobius.gameserver.model.zone.type.TownZone;
@@ -130,12 +136,6 @@ import org.l2jmobius.gameserver.network.serverpackets.TargetUnselected;
 import org.l2jmobius.gameserver.network.serverpackets.TeleportToLocation;
 import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
 import org.l2jmobius.gameserver.network.serverpackets.ValidateLocationInVehicle;
-import org.l2jmobius.gameserver.skills.Calculator;
-import org.l2jmobius.gameserver.skills.Formulas;
-import org.l2jmobius.gameserver.skills.Stats;
-import org.l2jmobius.gameserver.skills.effects.EffectCharge;
-import org.l2jmobius.gameserver.skills.funcs.Func;
-import org.l2jmobius.gameserver.skills.holders.ISkillsHolder;
 import org.l2jmobius.gameserver.util.Util;
 
 /**

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java

@@ -36,11 +36,11 @@ import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Attackable;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.entity.olympiad.Olympiad;
+import org.l2jmobius.gameserver.model.skills.Formulas;
+import org.l2jmobius.gameserver.model.skills.handlers.SkillDrain;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
-import org.l2jmobius.gameserver.skills.Formulas;
-import org.l2jmobius.gameserver.skills.handlers.SkillDrain;
 import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
 
 /**

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java

@@ -72,6 +72,7 @@ import org.l2jmobius.gameserver.model.multisell.Multisell;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
+import org.l2jmobius.gameserver.model.skills.Stats;
 import org.l2jmobius.gameserver.model.spawn.Spawn;
 import org.l2jmobius.gameserver.model.zone.type.TownZone;
 import org.l2jmobius.gameserver.network.GameClient;
@@ -91,7 +92,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
 import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
-import org.l2jmobius.gameserver.skills.Stats;
 import org.l2jmobius.gameserver.taskmanager.DecayTaskManager;
 
 /**

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -159,6 +159,11 @@ import org.l2jmobius.gameserver.model.items.type.WeaponType;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
+import org.l2jmobius.gameserver.model.skills.BaseStats;
+import org.l2jmobius.gameserver.model.skills.Formulas;
+import org.l2jmobius.gameserver.model.skills.Stats;
+import org.l2jmobius.gameserver.model.skills.effects.EffectCharge;
+import org.l2jmobius.gameserver.model.skills.handlers.SkillSummon;
 import org.l2jmobius.gameserver.model.variables.AccountVariables;
 import org.l2jmobius.gameserver.model.variables.PlayerVariables;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
@@ -221,11 +226,6 @@ import org.l2jmobius.gameserver.network.serverpackets.TradePressOwnOk;
 import org.l2jmobius.gameserver.network.serverpackets.TradeStart;
 import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
 import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
-import org.l2jmobius.gameserver.skills.BaseStats;
-import org.l2jmobius.gameserver.skills.Formulas;
-import org.l2jmobius.gameserver.skills.Stats;
-import org.l2jmobius.gameserver.skills.effects.EffectCharge;
-import org.l2jmobius.gameserver.skills.handlers.SkillSummon;
 import org.l2jmobius.gameserver.util.Broadcast;
 import org.l2jmobius.gameserver.util.FloodProtectors;
 import org.l2jmobius.gameserver.util.IllegalPlayerAction;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java

@@ -20,10 +20,10 @@ import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.skills.Calculator;
+import org.l2jmobius.gameserver.model.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Stats;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
-import org.l2jmobius.gameserver.skills.Calculator;
-import org.l2jmobius.gameserver.skills.Env;
-import org.l2jmobius.gameserver.skills.Stats;
 
 public class CreatureStat
 {

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java

@@ -17,7 +17,7 @@
 package org.l2jmobius.gameserver.model.actor.stat;
 
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
-import org.l2jmobius.gameserver.skills.Stats;
+import org.l2jmobius.gameserver.model.skills.Stats;
 
 public class NpcStat extends CreatureStat
 {

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PetStat.java

@@ -21,11 +21,11 @@ import org.l2jmobius.gameserver.datatables.xml.ExperienceData;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
+import org.l2jmobius.gameserver.model.skills.Stats;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.PetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.skills.Stats;
 
 public class PetStat extends SummonStat
 {

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/status/CreatureStatus.java

@@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.actor.instance.SummonInstance;
 import org.l2jmobius.gameserver.model.actor.stat.CreatureStat;
 import org.l2jmobius.gameserver.model.entity.Duel;
+import org.l2jmobius.gameserver.model.skills.Formulas;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.skills.Formulas;
 
 public class CreatureStatus
 {

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java

@@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.actor.instance.SummonInstance;
 import org.l2jmobius.gameserver.model.entity.Duel;
+import org.l2jmobius.gameserver.model.skills.Stats;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.skills.Stats;
 import org.l2jmobius.gameserver.util.Util;
 
 public class PlayerStatus extends PlayableStatus

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java

@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.StatsSet;
 import org.l2jmobius.gameserver.model.base.ClassId;
 import org.l2jmobius.gameserver.model.quest.Quest;
-import org.l2jmobius.gameserver.skills.Stats;
+import org.l2jmobius.gameserver.model.skills.Stats;
 
 /**
  * This cl contains all generic data of a Spawn object.<BR>

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.java

@@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.model.StatsSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.ArmorType;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
-import org.l2jmobius.gameserver.skills.funcs.Func;
+import org.l2jmobius.gameserver.model.skills.funcs.Func;
-import org.l2jmobius.gameserver.skills.funcs.FuncTemplate;
+import org.l2jmobius.gameserver.model.skills.funcs.FuncTemplate;
 
 /**
  * This class is dedicated to the management of armors.

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java

@@ -26,10 +26,10 @@ import org.l2jmobius.gameserver.model.StatsSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
-import org.l2jmobius.gameserver.skills.effects.EffectTemplate;
+import org.l2jmobius.gameserver.model.skills.effects.EffectTemplate;
-import org.l2jmobius.gameserver.skills.funcs.Func;
+import org.l2jmobius.gameserver.model.skills.funcs.Func;
-import org.l2jmobius.gameserver.skills.funcs.FuncTemplate;
+import org.l2jmobius.gameserver.model.skills.funcs.FuncTemplate;
 
 /**
  * This class contains all informations concerning the item (weapon, armor, etc).<BR>

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java

@@ -33,10 +33,10 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.WeaponType;
 import org.l2jmobius.gameserver.model.quest.Quest;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
-import org.l2jmobius.gameserver.skills.conditions.ConditionGameChance;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionGameChance;
-import org.l2jmobius.gameserver.skills.funcs.Func;
+import org.l2jmobius.gameserver.model.skills.funcs.Func;
-import org.l2jmobius.gameserver.skills.funcs.FuncTemplate;
+import org.l2jmobius.gameserver.model.skills.funcs.FuncTemplate;
 
 /**
  * This class is dedicated to the management of weapons.

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java

@@ -43,12 +43,12 @@ import org.l2jmobius.gameserver.model.items.Armor;
 import org.l2jmobius.gameserver.model.items.EtcItem;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.items.Weapon;
+import org.l2jmobius.gameserver.model.skills.funcs.Func;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.skills.funcs.Func;
 import org.l2jmobius.gameserver.util.IllegalPlayerAction;
 import org.l2jmobius.gameserver.util.Util;
 

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestState.java

@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
+import org.l2jmobius.gameserver.model.skills.Stats;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExShowQuestMark;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
@@ -45,7 +46,6 @@ import org.l2jmobius.gameserver.network.serverpackets.TutorialCloseHtml;
 import org.l2jmobius.gameserver.network.serverpackets.TutorialEnableClientEvent;
 import org.l2jmobius.gameserver.network.serverpackets.TutorialShowHtml;
 import org.l2jmobius.gameserver.network.serverpackets.TutorialShowQuestionMark;
-import org.l2jmobius.gameserver.skills.Stats;
 
 /**
  * @author Luis Arias

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/BaseStats.java

@@ -14,7 +14,7 @@
  * 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 org.l2jmobius.gameserver.skills;
+package org.l2jmobius.gameserver.model.skills;
 
 import java.io.File;
 import java.util.NoSuchElementException;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Calculator.java

@@ -14,13 +14,13 @@
  * 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 org.l2jmobius.gameserver.skills;
+package org.l2jmobius.gameserver.model.skills;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.l2jmobius.gameserver.skills.funcs.Func;
+import org.l2jmobius.gameserver.model.skills.funcs.Func;
 
 /**
  * A calculator is created to manage and dynamically calculate the effect of a character property (ex : MAX_HP, REGENERATE_HP_RATE...). In fact, each calculator is a table of Func object in which each Func represents a mathematic function : <BR>

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Env.java

@@ -14,7 +14,7 @@
  * 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 org.l2jmobius.gameserver.skills;
+package org.l2jmobius.gameserver.model.skills;
 
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.actor.Creature;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Formulas.java

@@ -14,7 +14,7 @@
  * 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 org.l2jmobius.gameserver.skills;
+package org.l2jmobius.gameserver.model.skills;
 
 import java.util.logging.Logger;
 
@@ -47,14 +47,14 @@ import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.items.Weapon;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.WeaponType;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionPlayerState;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionPlayerState.CheckPlayerState;
+import org.l2jmobius.gameserver.model.skills.conditions.ConditionUsingItemType;
+import org.l2jmobius.gameserver.model.skills.effects.EffectTemplate;
+import org.l2jmobius.gameserver.model.skills.funcs.Func;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.skills.conditions.ConditionPlayerState;
-import org.l2jmobius.gameserver.skills.conditions.ConditionPlayerState.CheckPlayerState;
-import org.l2jmobius.gameserver.skills.conditions.ConditionUsingItemType;
-import org.l2jmobius.gameserver.skills.effects.EffectTemplate;
-import org.l2jmobius.gameserver.skills.funcs.Func;
 import org.l2jmobius.gameserver.util.Util;
 
 /**

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Stats.java

@@ -14,7 +14,7 @@
  * 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 org.l2jmobius.gameserver.skills;
+package org.l2jmobius.gameserver.model.skills;
 
 import java.util.NoSuchElementException;
 

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/Condition.java

@@ -14,9 +14,9 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author mkizub

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionElementSeed.java

@@ -14,10 +14,10 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
-import org.l2jmobius.gameserver.skills.effects.EffectSeed;
+import org.l2jmobius.gameserver.model.skills.effects.EffectSeed;
 
 /**
  * @author Advi

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionForceBuff.java

@@ -14,12 +14,12 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
 import org.l2jmobius.gameserver.model.Effect;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
-import org.l2jmobius.gameserver.skills.effects.EffectBattleForce;
+import org.l2jmobius.gameserver.model.skills.effects.EffectBattleForce;
-import org.l2jmobius.gameserver.skills.effects.EffectSpellForce;
+import org.l2jmobius.gameserver.model.skills.effects.EffectSpellForce;
 
 /**
  * @author kombat

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionGameChance.java

@@ -14,10 +14,10 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
 import org.l2jmobius.commons.util.Rnd;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author Advi

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionGameTime.java

@@ -14,10 +14,10 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
 import org.l2jmobius.gameserver.GameTimeController;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author mkizub

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionInventory.java

@@ -14,9 +14,9 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author mkizub

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionItemId.java

@@ -14,9 +14,9 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author mkizub

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionListener.java

@@ -14,7 +14,7 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
 /**
  * @author mkizub

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionLogicAnd.java

@@ -14,9 +14,9 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author mkizub

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionLogicNot.java

@@ -14,9 +14,9 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author mkizub

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionLogicOr.java

@@ -14,9 +14,9 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author mkizub

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionPlayerBaseStats.java

@@ -14,11 +14,11 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author mkizub

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionPlayerClassIdRestriction.java

@@ -14,12 +14,12 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
 import java.util.ArrayList;
 
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * The Class ConditionPlayerClassIdRestriction. Credits: l2jserver

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionPlayerHp.java

@@ -14,9 +14,9 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author mr

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionPlayerHpPercentage.java

@@ -14,9 +14,9 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 public class ConditionPlayerHpPercentage extends Condition
 {

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionPlayerLevel.java

@@ -14,9 +14,9 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author mkizub

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionPlayerMp.java

@@ -14,9 +14,9 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 public class ConditionPlayerMp extends Condition
 {

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionPlayerRace.java

@@ -14,11 +14,11 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.base.Race;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author mkizub

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionPlayerState.java

@@ -14,10 +14,10 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author mkizub

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionPlayerWeight.java

@@ -14,11 +14,11 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
-import org.l2jmobius.gameserver.skills.Stats;
+import org.l2jmobius.gameserver.model.skills.Stats;
 
 /**
  * The Class ConditionPlayerWeight.

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionSkillStats.java

@@ -14,10 +14,10 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
-import org.l2jmobius.gameserver.skills.Stats;
+import org.l2jmobius.gameserver.model.skills.Stats;
 
 /**
  * @author mkizub

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionSlotItemId.java

@@ -14,12 +14,12 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
 import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author mkizub

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionSlotItemType.java

@@ -14,12 +14,12 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
 import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author mkizub

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetAggro.java

@@ -14,12 +14,12 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author mkizub

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetBodyPart.java

@@ -14,12 +14,12 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
 import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.items.Armor;
 import org.l2jmobius.gameserver.model.items.Item;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author mkizub

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetClassIdRestriction.java

@@ -14,12 +14,12 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
 import java.util.List;
 
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 public class ConditionTargetClassIdRestriction extends Condition
 {

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetLevel.java

@@ -14,9 +14,9 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author mkizub

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetNone.java

@@ -14,9 +14,9 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author mkizub

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetPvp.java

@@ -14,11 +14,11 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author eX1steam

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetRaceId.java

@@ -14,12 +14,12 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
 import java.util.List;
 
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author nBd

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetUsesWeaponKind.java

@@ -14,10 +14,10 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
 import org.l2jmobius.gameserver.model.items.Weapon;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author mkizub

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetWeight.java

@@ -14,12 +14,12 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
-import org.l2jmobius.gameserver.skills.Stats;
+import org.l2jmobius.gameserver.model.skills.Stats;
 
 /**
  * The Class ConditionPlayerWeight.

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionUsingItemType.java

@@ -14,14 +14,14 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
 import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.ArmorType;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * The Class ConditionUsingItemType.

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionUsingSkill.java

@@ -14,9 +14,9 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author mkizub

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionWithSkill.java

@@ -14,9 +14,9 @@
  * 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 org.l2jmobius.gameserver.skills.conditions;
+package org.l2jmobius.gameserver.model.skills.conditions;
 
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author Steuf

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectBattleForce.java

@@ -14,9 +14,9 @@
  * 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 org.l2jmobius.gameserver.skills.effects;
+package org.l2jmobius.gameserver.model.skills.effects;
 
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author kombat

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectBestowSkill.java

@@ -14,12 +14,12 @@
  * 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 org.l2jmobius.gameserver.skills.effects;
+package org.l2jmobius.gameserver.model.skills.effects;
 
 import org.l2jmobius.gameserver.datatables.SkillTable;
 import org.l2jmobius.gameserver.model.Effect;
 import org.l2jmobius.gameserver.model.Skill;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author kombat

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectBetray.java

@@ -14,13 +14,13 @@
  * 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 org.l2jmobius.gameserver.skills.effects;
+package org.l2jmobius.gameserver.model.skills.effects;
 
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.Effect;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author decad

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectBigHead.java

@@ -14,10 +14,10 @@
  * 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 org.l2jmobius.gameserver.skills.effects;
+package org.l2jmobius.gameserver.model.skills.effects;
 
 import org.l2jmobius.gameserver.model.Effect;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 public class EffectBigHead extends Effect
 {

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectBlockBuff.java

@@ -14,10 +14,10 @@
  * 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 org.l2jmobius.gameserver.skills.effects;
+package org.l2jmobius.gameserver.model.skills.effects;
 
 import org.l2jmobius.gameserver.model.Effect;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 public class EffectBlockBuff extends Effect
 {

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectBluff.java

@@ -14,7 +14,7 @@
  * 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 org.l2jmobius.gameserver.skills.effects;
+package org.l2jmobius.gameserver.model.skills.effects;
 
 import org.l2jmobius.gameserver.model.Effect;
 import org.l2jmobius.gameserver.model.actor.instance.ArtefactInstance;
@@ -23,10 +23,10 @@ import org.l2jmobius.gameserver.model.actor.instance.EffectPointInstance;
 import org.l2jmobius.gameserver.model.actor.instance.FolkInstance;
 import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance;
 import org.l2jmobius.gameserver.model.actor.instance.SiegeSummonInstance;
+import org.l2jmobius.gameserver.model.skills.Env;
 import org.l2jmobius.gameserver.network.serverpackets.BeginRotation;
 import org.l2jmobius.gameserver.network.serverpackets.StopRotation;
 import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
-import org.l2jmobius.gameserver.skills.Env;
 
 /**
  * @author programmos, sword developers Implementation of the Bluff Effect

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectBuff.java

@@ -14,10 +14,10 @@
  * 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 org.l2jmobius.gameserver.skills.effects;
+package org.l2jmobius.gameserver.model.skills.effects;
 
 import org.l2jmobius.gameserver.model.Effect;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author mkizub TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectCancel.java

@@ -14,16 +14,16 @@
  * 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 org.l2jmobius.gameserver.skills.effects;
+package org.l2jmobius.gameserver.model.skills.effects;
 
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.model.Effect;
 import org.l2jmobius.gameserver.model.Skill.SkillType;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Stats;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.skills.Env;
-import org.l2jmobius.gameserver.skills.Stats;
 
 final class EffectCancel extends Effect
 {

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectChameleonRest.java

@@ -14,16 +14,16 @@
  * 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 org.l2jmobius.gameserver.skills.effects;
+package org.l2jmobius.gameserver.model.skills.effects;
 
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.Effect;
 import org.l2jmobius.gameserver.model.Skill.SkillType;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.skills.Env;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.skills.Env;
 
 public class EffectChameleonRest extends Effect
 {

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectCharge.java

@@ -14,14 +14,14 @@
  * 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 org.l2jmobius.gameserver.skills.effects;
+package org.l2jmobius.gameserver.model.skills.effects;
 
 import org.l2jmobius.gameserver.model.Effect;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.skills.Env;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.skills.Env;
 
 public class EffectCharge extends Effect
 {

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectCharmOfLuck.java

@@ -14,11 +14,11 @@
  * 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 org.l2jmobius.gameserver.skills.effects;
+package org.l2jmobius.gameserver.model.skills.effects;
 
 import org.l2jmobius.gameserver.model.Effect;
 import org.l2jmobius.gameserver.model.actor.Playable;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author kerberos_20

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectClanGate.java

@@ -14,15 +14,15 @@
  * 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 org.l2jmobius.gameserver.skills.effects;
+package org.l2jmobius.gameserver.model.skills.effects;
 
 import org.l2jmobius.gameserver.model.Effect;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.skills.Env;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.skills.Env;
 
 /**
  * @author ZaKaX (Ghost @ L2D)

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectCombatPointHealOverTime.java

@@ -14,11 +14,11 @@
  * 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 org.l2jmobius.gameserver.skills.effects;
+package org.l2jmobius.gameserver.model.skills.effects;
 
 import org.l2jmobius.gameserver.model.Effect;
+import org.l2jmobius.gameserver.model.skills.Env;
 import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
-import org.l2jmobius.gameserver.skills.Env;
 
 class EffectCombatPointHealOverTime extends Effect
 {

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectConfuseMob.java

@@ -14,7 +14,7 @@
  * 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 org.l2jmobius.gameserver.skills.effects;
+package org.l2jmobius.gameserver.model.skills.effects;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.Effect;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Attackable;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.skills.Env;
+import org.l2jmobius.gameserver.model.skills.Env;
 
 /**
  * @author littlecrow Implementation of the Confusion Effect