diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/RecipeController.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/RecipeController.java index d176b2f5e0..b581afaab8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/RecipeController.java +++ b/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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/NpcTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/NpcTable.java index 85718f3633..7ac4c57e5e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/NpcTable.java +++ b/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.skills.Stats; +import org.l2jmobius.gameserver.model.skills.BaseStats; +import org.l2jmobius.gameserver.model.skills.Stats; /** * @version $Revision: 1.8.2.6.2.9 $ $Date: 2005/04/06 16:13:25 $ diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/SkillTreeTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/SkillTreeTable.java index 887bd5f7f5..bf822418e1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/SkillTreeTable.java +++ b/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.skills.holders.PlayerSkillHolder; +import org.l2jmobius.gameserver.model.skills.holders.ISkillsHolder; +import org.l2jmobius.gameserver.model.skills.holders.PlayerSkillHolder; /** * @version $Revision: 1.13.2.2.2.8 $ $Date: 2005/04/06 16:13:25 $ diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/AugmentationData.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/AugmentationData.java index a4aa0a83fd..0ad2c2d239 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/AugmentationData.java +++ b/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. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java index cfe8fabe31..cbacb0e246 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java +++ b/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.skills.Stats; -import org.l2jmobius.gameserver.skills.conditions.Condition; -import org.l2jmobius.gameserver.skills.conditions.ConditionElementSeed; -import org.l2jmobius.gameserver.skills.conditions.ConditionForceBuff; -import org.l2jmobius.gameserver.skills.conditions.ConditionGameChance; -import org.l2jmobius.gameserver.skills.conditions.ConditionGameTime; -import org.l2jmobius.gameserver.skills.conditions.ConditionGameTime.CheckGameTime; -import org.l2jmobius.gameserver.skills.conditions.ConditionLogicAnd; -import org.l2jmobius.gameserver.skills.conditions.ConditionLogicNot; -import org.l2jmobius.gameserver.skills.conditions.ConditionLogicOr; -import org.l2jmobius.gameserver.skills.conditions.ConditionPlayerClassIdRestriction; -import org.l2jmobius.gameserver.skills.conditions.ConditionPlayerHp; -import org.l2jmobius.gameserver.skills.conditions.ConditionPlayerHpPercentage; -import org.l2jmobius.gameserver.skills.conditions.ConditionPlayerLevel; -import org.l2jmobius.gameserver.skills.conditions.ConditionPlayerMp; -import org.l2jmobius.gameserver.skills.conditions.ConditionPlayerRace; -import org.l2jmobius.gameserver.skills.conditions.ConditionPlayerState; -import org.l2jmobius.gameserver.skills.conditions.ConditionPlayerState.CheckPlayerState; -import org.l2jmobius.gameserver.skills.conditions.ConditionSkillStats; -import org.l2jmobius.gameserver.skills.conditions.ConditionSlotItemId; -import org.l2jmobius.gameserver.skills.conditions.ConditionTargetAggro; -import org.l2jmobius.gameserver.skills.conditions.ConditionTargetClassIdRestriction; -import org.l2jmobius.gameserver.skills.conditions.ConditionTargetLevel; -import org.l2jmobius.gameserver.skills.conditions.ConditionTargetRaceId; -import org.l2jmobius.gameserver.skills.conditions.ConditionTargetUsesWeaponKind; -import org.l2jmobius.gameserver.skills.conditions.ConditionUsingItemType; -import org.l2jmobius.gameserver.skills.conditions.ConditionUsingSkill; -import org.l2jmobius.gameserver.skills.conditions.ConditionWithSkill; -import org.l2jmobius.gameserver.skills.effects.EffectTemplate; -import org.l2jmobius.gameserver.skills.funcs.FuncTemplate; -import org.l2jmobius.gameserver.skills.funcs.Lambda; -import org.l2jmobius.gameserver.skills.funcs.LambdaCalc; -import org.l2jmobius.gameserver.skills.funcs.LambdaConst; -import org.l2jmobius.gameserver.skills.funcs.LambdaStats; +import org.l2jmobius.gameserver.model.skills.Env; +import org.l2jmobius.gameserver.model.skills.Stats; +import org.l2jmobius.gameserver.model.skills.conditions.Condition; +import org.l2jmobius.gameserver.model.skills.conditions.ConditionElementSeed; +import org.l2jmobius.gameserver.model.skills.conditions.ConditionForceBuff; +import org.l2jmobius.gameserver.model.skills.conditions.ConditionGameChance; +import org.l2jmobius.gameserver.model.skills.conditions.ConditionGameTime; +import org.l2jmobius.gameserver.model.skills.conditions.ConditionGameTime.CheckGameTime; +import org.l2jmobius.gameserver.model.skills.conditions.ConditionLogicAnd; +import org.l2jmobius.gameserver.model.skills.conditions.ConditionLogicNot; +import org.l2jmobius.gameserver.model.skills.conditions.ConditionLogicOr; +import org.l2jmobius.gameserver.model.skills.conditions.ConditionPlayerClassIdRestriction; +import org.l2jmobius.gameserver.model.skills.conditions.ConditionPlayerHp; +import org.l2jmobius.gameserver.model.skills.conditions.ConditionPlayerHpPercentage; +import org.l2jmobius.gameserver.model.skills.conditions.ConditionPlayerLevel; +import org.l2jmobius.gameserver.model.skills.conditions.ConditionPlayerMp; +import org.l2jmobius.gameserver.model.skills.conditions.ConditionPlayerRace; +import org.l2jmobius.gameserver.model.skills.conditions.ConditionPlayerState; +import org.l2jmobius.gameserver.model.skills.conditions.ConditionPlayerState.CheckPlayerState; +import org.l2jmobius.gameserver.model.skills.conditions.ConditionSkillStats; +import org.l2jmobius.gameserver.model.skills.conditions.ConditionSlotItemId; +import org.l2jmobius.gameserver.model.skills.conditions.ConditionTargetAggro; +import org.l2jmobius.gameserver.model.skills.conditions.ConditionTargetClassIdRestriction; +import org.l2jmobius.gameserver.model.skills.conditions.ConditionTargetLevel; +import org.l2jmobius.gameserver.model.skills.conditions.ConditionTargetRaceId; +import org.l2jmobius.gameserver.model.skills.conditions.ConditionTargetUsesWeaponKind; +import org.l2jmobius.gameserver.model.skills.conditions.ConditionUsingItemType; +import org.l2jmobius.gameserver.model.skills.conditions.ConditionUsingSkill; +import org.l2jmobius.gameserver.model.skills.conditions.ConditionWithSkill; +import org.l2jmobius.gameserver.model.skills.effects.EffectTemplate; +import org.l2jmobius.gameserver.model.skills.funcs.FuncTemplate; +import org.l2jmobius.gameserver.model.skills.funcs.Lambda; +import org.l2jmobius.gameserver.model.skills.funcs.LambdaCalc; +import org.l2jmobius.gameserver.model.skills.funcs.LambdaConst; +import org.l2jmobius.gameserver.model.skills.funcs.LambdaStats; /** * @author mkizub diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentSkill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentSkill.java index 2f892ca2eb..7120f50424 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentSkill.java +++ b/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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminFightCalculator.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminFightCalculator.java index 90f5c55bc6..c45483ab8a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminFightCalculator.java +++ b/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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java index 6fa8e558c8..8affb95c68 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java +++ b/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 { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulShots.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulShots.java index caea687390..9c18b4da83 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulShots.java +++ b/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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java index 86b0a68078..3a83e92e2f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java +++ b/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; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java index e9f5e874b6..b8a17a6006 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java +++ b/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 { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/CpDam.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/CpDam.java index 46b9e901af..e25b3a7e9b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/CpDam.java +++ b/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. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Disablers.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Disablers.java index 1d713893d2..478517d84a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Disablers.java +++ b/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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Heal.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Heal.java index c945ce77bc..25a4b542d2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Heal.java +++ b/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 { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ManaHeal.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ManaHeal.java index 3adca3ca49..82eae2333e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ManaHeal.java +++ b/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 { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Manadam.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Manadam.java index 9b026c31ee..13ccc48fe2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Manadam.java +++ b/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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Mdam.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Mdam.java index 694383b831..d52d8e2092 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Mdam.java +++ b/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 { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java index e9d4ef48d0..6ba0411059 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java +++ b/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 { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Resurrect.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Resurrect.java index fc0223d90f..2bc0d6520c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Resurrect.java +++ b/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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Spoil.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Spoil.java index 26a23f3be0..abb1b079a0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Spoil.java +++ b/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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/StrSiegeAssault.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/StrSiegeAssault.java index 0f5a09c87e..068a8c466d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/StrSiegeAssault.java +++ b/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_ diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Unlock.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Unlock.java index 835a17792d..5c4ee1f36f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Unlock.java +++ b/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 { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java index 31c595020a..0566aa381c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java +++ b/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. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Augmentation.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Augmentation.java index 830f5b9a31..2f18cdf602 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Augmentation.java +++ b/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.skills.funcs.FuncAdd; -import org.l2jmobius.gameserver.skills.funcs.LambdaConst; +import org.l2jmobius.gameserver.model.skills.Stats; +import org.l2jmobius.gameserver.model.skills.funcs.FuncAdd; +import org.l2jmobius.gameserver.model.skills.funcs.LambdaConst; /** * Used to store an augmentation and its bonus diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ChanceSkillList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ChanceSkillList.java index af51e55e10..f216ca248e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ChanceSkillList.java +++ b/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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Effect.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Effect.java index 33b0e77b48..bce8230011 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Effect.java +++ b/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 { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ForceBuff.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ForceBuff.java index 3c5b960003..691c26d775 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ForceBuff.java +++ b/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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Party.java index 5a5fa478b8..4d5521776f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Party.java +++ b/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; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java index f261cfba97..d06317229c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java +++ b/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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/StatsSet.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/StatsSet.java index f1667e3582..e7d34c6804 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/StatsSet.java +++ b/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; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 6def7c0552..73704ff611 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/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; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java index ad3007b1f1..99a97b007e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/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; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java index 531684f62e..7dd5fddc62 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java +++ b/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; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java index bdbaafcf34..d90f703bf8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java +++ b/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; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index bd2045b691..89cdffcd90 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/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; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index 097131f8c9..d5991a5b7a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/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 { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 4b386353e1..4238ab6564 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/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 { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PetStat.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PetStat.java index 0649d6859e..597853baff 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PetStat.java +++ b/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 { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/status/CreatureStatus.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/status/CreatureStatus.java index 808380d6f5..d5da524fed 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/status/CreatureStatus.java +++ b/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 { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java index fd1a3879d9..810d82bac1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java +++ b/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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 88d4e9999d..14630916b2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/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.
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.java index d32ebf0fac..a0cfb7e779 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/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.skills.funcs.Func; -import org.l2jmobius.gameserver.skills.funcs.FuncTemplate; +import org.l2jmobius.gameserver.model.skills.Env; +import org.l2jmobius.gameserver.model.skills.funcs.Func; +import org.l2jmobius.gameserver.model.skills.funcs.FuncTemplate; /** * This class is dedicated to the management of armors. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java index f09240ebe1..95402114cb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/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.skills.effects.EffectTemplate; -import org.l2jmobius.gameserver.skills.funcs.Func; -import org.l2jmobius.gameserver.skills.funcs.FuncTemplate; +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; /** * This class contains all informations concerning the item (weapon, armor, etc).
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java index ce5ba47cdc..826e9c1669 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/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.skills.conditions.ConditionGameChance; -import org.l2jmobius.gameserver.skills.funcs.Func; -import org.l2jmobius.gameserver.skills.funcs.FuncTemplate; +import org.l2jmobius.gameserver.model.skills.Env; +import org.l2jmobius.gameserver.model.skills.conditions.ConditionGameChance; +import org.l2jmobius.gameserver.model.skills.funcs.Func; +import org.l2jmobius.gameserver.model.skills.funcs.FuncTemplate; /** * This class is dedicated to the management of weapons. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 6099069df4..db8635e7ae 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/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; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestState.java index f38ab1eb24..7beeacffe1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/BaseStats.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/BaseStats.java similarity index 99% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/BaseStats.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/BaseStats.java index ee969830df..f5275ec40e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/BaseStats.java +++ b/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 . */ -package org.l2jmobius.gameserver.skills; +package org.l2jmobius.gameserver.model.skills; import java.io.File; import java.util.NoSuchElementException; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/Calculator.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Calculator.java similarity index 97% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/Calculator.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Calculator.java index 762809f59e..a5ce5d653a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/Calculator.java +++ b/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 . */ -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 :
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/Env.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Env.java similarity index 97% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/Env.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Env.java index 0c671514d5..7f7c69d6c0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/Env.java +++ b/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 . */ -package org.l2jmobius.gameserver.skills; +package org.l2jmobius.gameserver.model.skills; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Creature; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/Formulas.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Formulas.java similarity index 99% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/Formulas.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Formulas.java index ae2e15aef7..dc06b5c9d6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/Formulas.java +++ b/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 . */ -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; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/Stats.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Stats.java similarity index 99% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/Stats.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Stats.java index 2b58e2a79c..99a3f893ea 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/Stats.java +++ b/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 . */ -package org.l2jmobius.gameserver.skills; +package org.l2jmobius.gameserver.model.skills; import java.util.NoSuchElementException; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/Condition.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/Condition.java similarity index 93% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/Condition.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/Condition.java index dec4160614..32aaf14e21 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/Condition.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionElementSeed.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionElementSeed.java similarity index 92% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionElementSeed.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionElementSeed.java index 1872fea68c..c08a99a25c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionElementSeed.java +++ b/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 . */ -package org.l2jmobius.gameserver.skills.conditions; +package org.l2jmobius.gameserver.model.skills.conditions; -import org.l2jmobius.gameserver.skills.Env; -import org.l2jmobius.gameserver.skills.effects.EffectSeed; +import org.l2jmobius.gameserver.model.skills.Env; +import org.l2jmobius.gameserver.model.skills.effects.EffectSeed; /** * @author Advi diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionForceBuff.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionForceBuff.java similarity index 87% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionForceBuff.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionForceBuff.java index 4422793abf..0b4b1ad604 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionForceBuff.java +++ b/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 . */ -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.skills.effects.EffectBattleForce; -import org.l2jmobius.gameserver.skills.effects.EffectSpellForce; +import org.l2jmobius.gameserver.model.skills.Env; +import org.l2jmobius.gameserver.model.skills.effects.EffectBattleForce; +import org.l2jmobius.gameserver.model.skills.effects.EffectSpellForce; /** * @author kombat diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionGameChance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionGameChance.java similarity index 90% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionGameChance.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionGameChance.java index fd54cc5fa2..ba53f7f959 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionGameChance.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionGameTime.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionGameTime.java similarity index 91% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionGameTime.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionGameTime.java index 0487cce945..75f8d5f820 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionGameTime.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionInventory.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionInventory.java similarity index 89% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionInventory.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionInventory.java index 1d63702b23..77538b03d7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionInventory.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionItemId.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionItemId.java similarity index 90% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionItemId.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionItemId.java index 093b6146a2..abf585a555 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionItemId.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionListener.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionListener.java similarity index 93% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionListener.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionListener.java index 96d9034ddb..1912f43ada 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionListener.java +++ b/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 . */ -package org.l2jmobius.gameserver.skills.conditions; +package org.l2jmobius.gameserver.model.skills.conditions; /** * @author mkizub diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionLogicAnd.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionLogicAnd.java similarity index 94% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionLogicAnd.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionLogicAnd.java index 65cf199d36..ebdb484c8b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionLogicAnd.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionLogicNot.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionLogicNot.java similarity index 92% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionLogicNot.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionLogicNot.java index f881f549b4..8b80fdbcbb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionLogicNot.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionLogicOr.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionLogicOr.java similarity index 93% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionLogicOr.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionLogicOr.java index 07389c5a96..9953c698b6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionLogicOr.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionPlayerBaseStats.java similarity index 93% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionPlayerBaseStats.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionPlayerBaseStats.java index 8bd4755575..18d2616c03 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionPlayerBaseStats.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionPlayerClassIdRestriction.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionPlayerClassIdRestriction.java similarity index 92% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionPlayerClassIdRestriction.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionPlayerClassIdRestriction.java index 1d79e25dd4..953d1704c4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionPlayerClassIdRestriction.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionPlayerHp.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionPlayerHp.java similarity index 90% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionPlayerHp.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionPlayerHp.java index 372d5bdf5a..4e9ca0e89d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionPlayerHp.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionPlayerHpPercentage.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionPlayerHpPercentage.java similarity index 90% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionPlayerHpPercentage.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionPlayerHpPercentage.java index cb70c3ebee..5f5034b5df 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionPlayerHpPercentage.java +++ b/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 . */ -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 { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionPlayerLevel.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionPlayerLevel.java similarity index 90% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionPlayerLevel.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionPlayerLevel.java index 7df03a0e80..f75b638cac 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionPlayerLevel.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionPlayerMp.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionPlayerMp.java similarity index 89% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionPlayerMp.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionPlayerMp.java index 2e1e4482b6..3f20e285e1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionPlayerMp.java +++ b/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 . */ -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 { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionPlayerRace.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionPlayerRace.java similarity index 91% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionPlayerRace.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionPlayerRace.java index edf839cc98..a4608b6cf1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionPlayerRace.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionPlayerState.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionPlayerState.java similarity index 94% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionPlayerState.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionPlayerState.java index 1a7d9736ef..ff5af71d33 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionPlayerState.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionPlayerWeight.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionPlayerWeight.java similarity index 90% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionPlayerWeight.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionPlayerWeight.java index ef43a18923..1e95b1589f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionPlayerWeight.java +++ b/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 . */ -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.skills.Stats; +import org.l2jmobius.gameserver.model.skills.Env; +import org.l2jmobius.gameserver.model.skills.Stats; /** * The Class ConditionPlayerWeight. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionSkillStats.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionSkillStats.java similarity index 86% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionSkillStats.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionSkillStats.java index 620277aa50..c48416a734 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionSkillStats.java +++ b/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 . */ -package org.l2jmobius.gameserver.skills.conditions; +package org.l2jmobius.gameserver.model.skills.conditions; -import org.l2jmobius.gameserver.skills.Env; -import org.l2jmobius.gameserver.skills.Stats; +import org.l2jmobius.gameserver.model.skills.Env; +import org.l2jmobius.gameserver.model.skills.Stats; /** * @author mkizub diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionSlotItemId.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionSlotItemId.java similarity index 93% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionSlotItemId.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionSlotItemId.java index ed424ed216..3f5a5c5f4e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionSlotItemId.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionSlotItemType.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionSlotItemType.java similarity index 93% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionSlotItemType.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionSlotItemType.java index 633b38d961..81e8bf542c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionSlotItemType.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetAggro.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetAggro.java similarity index 92% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetAggro.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetAggro.java index 6ddd03061c..3efe55ae6c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetAggro.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetBodyPart.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetBodyPart.java similarity index 93% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetBodyPart.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetBodyPart.java index f9a618d183..ebee4aa8db 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetBodyPart.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetClassIdRestriction.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetClassIdRestriction.java similarity index 91% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetClassIdRestriction.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetClassIdRestriction.java index 3c9e8d2930..2b19a4375f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetClassIdRestriction.java +++ b/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 . */ -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 { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetLevel.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetLevel.java similarity index 90% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetLevel.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetLevel.java index 95e96ea11f..52e7cd0132 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetLevel.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetNone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetNone.java similarity index 89% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetNone.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetNone.java index 928b689a25..10bae8e0ab 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetNone.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetPvp.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetPvp.java similarity index 92% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetPvp.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetPvp.java index ddff07ba0a..dde99f45e8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetPvp.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetRaceId.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetRaceId.java similarity index 92% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetRaceId.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetRaceId.java index 4c0f241fa2..73abe85ca0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetRaceId.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetUsesWeaponKind.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetUsesWeaponKind.java similarity index 92% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetUsesWeaponKind.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetUsesWeaponKind.java index a9bec80dca..20e72aacfb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetUsesWeaponKind.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetWeight.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetWeight.java similarity index 91% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetWeight.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetWeight.java index d1618e278f..0675322277 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetWeight.java +++ b/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 . */ -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.skills.Stats; +import org.l2jmobius.gameserver.model.skills.Env; +import org.l2jmobius.gameserver.model.skills.Stats; /** * The Class ConditionPlayerWeight. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionUsingItemType.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionUsingItemType.java similarity index 96% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionUsingItemType.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionUsingItemType.java index 718b35827a..e9db8d60e3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionUsingItemType.java +++ b/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 . */ -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. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionUsingSkill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionUsingSkill.java similarity index 90% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionUsingSkill.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionUsingSkill.java index 708bd42eee..b5e74239a8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionUsingSkill.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionWithSkill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionWithSkill.java similarity index 90% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionWithSkill.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionWithSkill.java index a0b82c5ef6..bd5c28461a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionWithSkill.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectBattleForce.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectBattleForce.java similarity index 90% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectBattleForce.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectBattleForce.java index 0ab624dba2..583b14cfe5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectBattleForce.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectBestowSkill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectBestowSkill.java similarity index 93% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectBestowSkill.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectBestowSkill.java index 72eb92c2b5..be67ce9156 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectBestowSkill.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectBetray.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectBetray.java similarity index 95% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectBetray.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectBetray.java index d817bd744f..baac107111 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectBetray.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectBigHead.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectBigHead.java similarity index 91% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectBigHead.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectBigHead.java index 575cb85a00..43865d398b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectBigHead.java +++ b/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 . */ -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 { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectBlockBuff.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectBlockBuff.java similarity index 91% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectBlockBuff.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectBlockBuff.java index 6114257f96..bbc02c567f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectBlockBuff.java +++ b/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 . */ -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 { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectBluff.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectBluff.java similarity index 96% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectBluff.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectBluff.java index 1c1acc3f31..489eca56a1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectBluff.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectBuff.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectBuff.java similarity index 92% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectBuff.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectBuff.java index 351b2a408e..64809c77e4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectBuff.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectCancel.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectCancel.java similarity index 95% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectCancel.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectCancel.java index 1c1ab5ba7c..701c082e5d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectCancel.java +++ b/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 . */ -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 { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectChameleonRest.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectChameleonRest.java similarity index 96% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectChameleonRest.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectChameleonRest.java index c4ff4b93fd..f75ed5e270 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectChameleonRest.java +++ b/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 . */ -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 { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectCharge.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectCharge.java similarity index 94% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectCharge.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectCharge.java index aafa7ed943..8745d75c04 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectCharge.java +++ b/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 . */ -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 { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectCharmOfLuck.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectCharmOfLuck.java similarity index 93% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectCharmOfLuck.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectCharmOfLuck.java index a04bc5a450..abefb9a8f0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectCharmOfLuck.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectClanGate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectClanGate.java similarity index 94% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectClanGate.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectClanGate.java index 72e00889e2..830af41b20 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectClanGate.java +++ b/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 . */ -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) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectCombatPointHealOverTime.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectCombatPointHealOverTime.java similarity index 93% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectCombatPointHealOverTime.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectCombatPointHealOverTime.java index 8342929db3..7133fac36b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectCombatPointHealOverTime.java +++ b/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 . */ -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 { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectConfuseMob.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectConfuseMob.java similarity index 95% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectConfuseMob.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectConfuseMob.java index e6e4431e7b..e85f1fcb16 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectConfuseMob.java +++ b/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 . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectConfusion.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectConfusion.java similarity index 95% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectConfusion.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectConfusion.java index b50b0eaa21..7ea2db421e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectConfusion.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectConfusion.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.effects; +package org.l2jmobius.gameserver.model.skills.effects; import java.util.ArrayList; import java.util.List; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.WorldObject; 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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectDamOverTime.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectDamOverTime.java similarity index 95% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectDamOverTime.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectDamOverTime.java index 3a821f1c17..cca16ad7b2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectDamOverTime.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectDamOverTime.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.effects; +package org.l2jmobius.gameserver.model.skills.effects; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill.SkillTargetType; import org.l2jmobius.gameserver.model.actor.Attackable; +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; class EffectDamOverTime extends Effect { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectDebuff.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectDebuff.java similarity index 90% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectDebuff.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectDebuff.java index f7f7779dbc..17e2304c16 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectDebuff.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectDebuff.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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 EffectDebuff extends Effect { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectDeflectBuff.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectDeflectBuff.java similarity index 94% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectDeflectBuff.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectDeflectBuff.java index bcdfda1f7a..3392099728 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectDeflectBuff.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectDeflectBuff.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.effects; +package org.l2jmobius.gameserver.model.skills.effects; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill.SkillType; +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 Java diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectFakeDeath.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectFakeDeath.java similarity index 94% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectFakeDeath.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectFakeDeath.java index eb21d91635..207609c589 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectFakeDeath.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectFakeDeath.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.skills.Env; /** * @author mkizub diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectFear.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectFear.java similarity index 97% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectFear.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectFear.java index e6f377afaa..fe469b5a8d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectFear.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectFear.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.effects; +package org.l2jmobius.gameserver.model.skills.effects; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeGuardInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeSummonInstance; -import org.l2jmobius.gameserver.skills.Env; +import org.l2jmobius.gameserver.model.skills.Env; /** * @author littlecrow Implementation of the Fear Effect diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectForce.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectForce.java similarity index 94% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectForce.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectForce.java index 84bac64f80..fc1895f4a3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectForce.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectForce.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.effects; +package org.l2jmobius.gameserver.model.skills.effects; import java.util.logging.Logger; 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; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectFusion.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectFusion.java similarity index 93% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectFusion.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectFusion.java index 6d9be98b44..b79f878738 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectFusion.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectFusion.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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.skills.Env; +import org.l2jmobius.gameserver.model.skills.Env; /** * @author Kerberos diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectGrow.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectGrow.java similarity index 95% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectGrow.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectGrow.java index 60f8f2116c..9532520aeb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectGrow.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectGrow.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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.NpcInstance; -import org.l2jmobius.gameserver.skills.Env; +import org.l2jmobius.gameserver.model.skills.Env; public class EffectGrow extends Effect { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectHealOverTime.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectHealOverTime.java similarity index 94% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectHealOverTime.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectHealOverTime.java index a4904fc7f3..19cb1ec516 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectHealOverTime.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectHealOverTime.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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.DoorInstance; +import org.l2jmobius.gameserver.model.skills.Env; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; -import org.l2jmobius.gameserver.skills.Env; class EffectHealOverTime extends Effect { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectImmobileUntilAttacked.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectImmobileUntilAttacked.java similarity index 93% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectImmobileUntilAttacked.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectImmobileUntilAttacked.java index b6c0a945ed..d1f490056d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectImmobileUntilAttacked.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectImmobileUntilAttacked.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.effects; +package org.l2jmobius.gameserver.model.skills.effects; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.Effect; -import org.l2jmobius.gameserver.skills.Env; +import org.l2jmobius.gameserver.model.skills.Env; /** * @author programmos diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectImobileBuff.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectImobileBuff.java similarity index 92% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectImobileBuff.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectImobileBuff.java index 0153083df8..6e96911457 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectImobileBuff.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectImobileBuff.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectImobilePetBuff.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectImobilePetBuff.java similarity index 93% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectImobilePetBuff.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectImobilePetBuff.java index 18b40c6f2b..dd6665b1ba 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectImobilePetBuff.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectImobilePetBuff.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.skills.Env; +import org.l2jmobius.gameserver.model.skills.Env; /** * @author demonia diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectInterrupt.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectInterrupt.java similarity index 91% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectInterrupt.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectInterrupt.java index 381fcb97ce..5696906479 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectInterrupt.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectInterrupt.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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 KidZor diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectInvincible.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectInvincible.java similarity index 92% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectInvincible.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectInvincible.java index d4c92dd3da..4ff4f9244b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectInvincible.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectInvincible.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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 EffectInvincible extends Effect { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectManaDamOverTime.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectManaDamOverTime.java similarity index 93% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectManaDamOverTime.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectManaDamOverTime.java index 4b7c7a4419..6b9c8ebdd9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectManaDamOverTime.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectManaDamOverTime.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.skills.Env; class EffectManaDamOverTime extends Effect { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectManaHealOverTime.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectManaHealOverTime.java similarity index 93% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectManaHealOverTime.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectManaHealOverTime.java index d37a290765..4a98adede4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectManaHealOverTime.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectManaHealOverTime.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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 EffectManaHealOverTime extends Effect { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectMeditation.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectMeditation.java similarity index 92% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectMeditation.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectMeditation.java index ee959d830d..fa2d6935a0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectMeditation.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectMeditation.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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 EffectMeditation extends Effect { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectMpConsumePerLevel.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectMpConsumePerLevel.java similarity index 93% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectMpConsumePerLevel.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectMpConsumePerLevel.java index 177cf4e60e..8f9e75426b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectMpConsumePerLevel.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectMpConsumePerLevel.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.skills.Env; public class EffectMpConsumePerLevel extends Effect { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectMute.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectMute.java similarity index 92% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectMute.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectMute.java index 7729cef39a..9a3e1c278f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectMute.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectMute.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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 EffectMute extends Effect { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectNegate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectNegate.java similarity index 95% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectNegate.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectNegate.java index 4fcf0eff91..cfa7e72483 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectNegate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectNegate.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.effects; +package org.l2jmobius.gameserver.model.skills.effects; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.Skill.SkillType; -import org.l2jmobius.gameserver.skills.Env; +import org.l2jmobius.gameserver.model.skills.Env; /** * @author Gnat diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectNoblesseBless.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectNoblesseBless.java similarity index 93% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectNoblesseBless.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectNoblesseBless.java index 605cc5f2a3..d06bdc58a8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectNoblesseBless.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectNoblesseBless.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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 earendil diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectParalyze.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectParalyze.java similarity index 93% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectParalyze.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectParalyze.java index 9138d0dcf7..db5fcdd8f6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectParalyze.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectParalyze.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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.skills.Env; +import org.l2jmobius.gameserver.model.skills.Env; final class EffectParalyze extends Effect { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectPetrification.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectPetrification.java similarity index 93% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectPetrification.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectPetrification.java index 6285557c0c..4d2739eb6e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectPetrification.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectPetrification.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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.skills.Env; +import org.l2jmobius.gameserver.model.skills.Env; public class EffectPetrification extends Effect { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectPhoenixBless.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectPhoenixBless.java similarity index 93% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectPhoenixBless.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectPhoenixBless.java index 6f8e98e286..cc3e090fcd 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectPhoenixBless.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectPhoenixBless.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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 Faror diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectProtectionBlessing.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectProtectionBlessing.java similarity index 93% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectProtectionBlessing.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectProtectionBlessing.java index 9c3204c9b2..02959ae3af 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectProtectionBlessing.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectProtectionBlessing.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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 eX1steam diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectPsychicalMute.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectPsychicalMute.java similarity index 92% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectPsychicalMute.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectPsychicalMute.java index 42e3cca8c3..cb6df4f413 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectPsychicalMute.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectPsychicalMute.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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 -Nemesiss- diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectRelax.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectRelax.java similarity index 96% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectRelax.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectRelax.java index aa4ff59de2..2a7eaeebec 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectRelax.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectRelax.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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.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; class EffectRelax extends Effect { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectRemoveTarget.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectRemoveTarget.java similarity index 94% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectRemoveTarget.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectRemoveTarget.java index 34f7389d7f..e877163589 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectRemoveTarget.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectRemoveTarget.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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.instance.GrandBossInstance; import org.l2jmobius.gameserver.model.actor.instance.RaidBossInstance; -import org.l2jmobius.gameserver.skills.Env; +import org.l2jmobius.gameserver.model.skills.Env; /** * @author programmos diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectRoot.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectRoot.java similarity index 92% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectRoot.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectRoot.java index 40a45d9fa0..4315a4fb19 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectRoot.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectRoot.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSeed.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSeed.java similarity index 91% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSeed.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSeed.java index 27a3d228ae..37888971fb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSeed.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSeed.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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 EffectSeed extends Effect { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSignet.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignet.java similarity index 93% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSignet.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignet.java index 020208152f..1fde192325 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSignet.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignet.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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; @@ -22,11 +22,11 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.EffectPointInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.skills.Env; +import org.l2jmobius.gameserver.model.skills.handlers.SkillSignet; +import org.l2jmobius.gameserver.model.skills.handlers.SkillSignetCasttime; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.skills.Env; -import org.l2jmobius.gameserver.skills.handlers.SkillSignet; -import org.l2jmobius.gameserver.skills.handlers.SkillSignetCasttime; public class EffectSignet extends Effect { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSignetAntiSummon.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignetAntiSummon.java similarity index 96% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSignetAntiSummon.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignetAntiSummon.java index 84ec0580f0..2f5ea2e7aa 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSignetAntiSummon.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignetAntiSummon.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.effects; +package org.l2jmobius.gameserver.model.skills.effects; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.model.Effect; @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.EffectPointInstance; 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 EffectSignetAntiSummon extends Effect { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSignetMDam.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignetMDam.java similarity index 95% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSignetMDam.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignetMDam.java index cf3ec375f7..ba53d6a768 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSignetMDam.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignetMDam.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.effects; +package org.l2jmobius.gameserver.model.skills.effects; import java.util.ArrayList; import java.util.List; @@ -33,11 +33,11 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.EffectPointInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.skills.Env; +import org.l2jmobius.gameserver.model.skills.Formulas; +import org.l2jmobius.gameserver.model.skills.handlers.SkillSignetCasttime; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; -import org.l2jmobius.gameserver.skills.Env; -import org.l2jmobius.gameserver.skills.Formulas; -import org.l2jmobius.gameserver.skills.handlers.SkillSignetCasttime; /** * @author Shyla diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSignetNoise.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignetNoise.java similarity index 94% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSignetNoise.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignetNoise.java index fe86aaa09c..1d65336cf4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSignetNoise.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignetNoise.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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.EffectPointInstance; -import org.l2jmobius.gameserver.skills.Env; +import org.l2jmobius.gameserver.model.skills.Env; public class EffectSignetNoise extends Effect { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSilenceMagicPhysical.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSilenceMagicPhysical.java similarity index 92% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSilenceMagicPhysical.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSilenceMagicPhysical.java index 1c7f4f7aac..e02dea6578 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSilenceMagicPhysical.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSilenceMagicPhysical.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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 EffectSilenceMagicPhysical extends Effect { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSilentMove.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSilentMove.java similarity index 95% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSilentMove.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSilentMove.java index 0bbb1dd22e..e874db6d1e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSilentMove.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSilentMove.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.effects; +package org.l2jmobius.gameserver.model.skills.effects; 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; final class EffectSilentMove extends Effect { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSleep.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSleep.java similarity index 92% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSleep.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSleep.java index 334167e861..fa559444a0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSleep.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSleep.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSpellForce.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSpellForce.java similarity index 90% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSpellForce.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSpellForce.java index 85337aa73a..48698bc10a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSpellForce.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSpellForce.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectStun.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectStun.java similarity index 92% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectStun.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectStun.java index d982cdeac7..5f7b513bf7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectStun.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectStun.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectStunSelf.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectStunSelf.java similarity index 92% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectStunSelf.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectStunSelf.java index a092bbaa94..ef8f6d336e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectStunSelf.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectStunSelf.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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 EffectStunSelf extends Effect { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectTargetMe.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectTargetMe.java similarity index 94% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectTargetMe.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectTargetMe.java index d626d615b9..e726fbeb18 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectTargetMe.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectTargetMe.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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.Playable; import org.l2jmobius.gameserver.model.actor.instance.SiegeSummonInstance; +import org.l2jmobius.gameserver.model.skills.Env; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; -import org.l2jmobius.gameserver.skills.Env; /** * @author eX1steam diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectTemplate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectTemplate.java similarity index 91% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectTemplate.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectTemplate.java index e02c6fbbe5..8d8c887111 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectTemplate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.effects; +package org.l2jmobius.gameserver.model.skills.effects; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -22,10 +22,10 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill.SkillType; -import org.l2jmobius.gameserver.skills.Env; -import org.l2jmobius.gameserver.skills.conditions.Condition; -import org.l2jmobius.gameserver.skills.funcs.FuncTemplate; -import org.l2jmobius.gameserver.skills.funcs.Lambda; +import org.l2jmobius.gameserver.model.skills.Env; +import org.l2jmobius.gameserver.model.skills.conditions.Condition; +import org.l2jmobius.gameserver.model.skills.funcs.FuncTemplate; +import org.l2jmobius.gameserver.model.skills.funcs.Lambda; /** * @author mkizub diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/Func.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/Func.java similarity index 92% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/Func.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/Func.java index d82bdf32b4..591ccf085c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/Func.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/Func.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.funcs; +package org.l2jmobius.gameserver.model.skills.funcs; -import org.l2jmobius.gameserver.skills.Env; -import org.l2jmobius.gameserver.skills.Stats; -import org.l2jmobius.gameserver.skills.conditions.Condition; +import org.l2jmobius.gameserver.model.skills.Env; +import org.l2jmobius.gameserver.model.skills.Stats; +import org.l2jmobius.gameserver.model.skills.conditions.Condition; /** * A Func object is a component of a Calculator 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 mathematics function :
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncAdd.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncAdd.java similarity index 86% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncAdd.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncAdd.java index 1b13c42bf6..25ad098c7c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncAdd.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncAdd.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.funcs; +package org.l2jmobius.gameserver.model.skills.funcs; -import org.l2jmobius.gameserver.skills.Env; -import org.l2jmobius.gameserver.skills.Stats; +import org.l2jmobius.gameserver.model.skills.Env; +import org.l2jmobius.gameserver.model.skills.Stats; public class FuncAdd extends Func { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncBaseMul.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncBaseMul.java similarity index 87% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncBaseMul.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncBaseMul.java index e2101f08fb..e5625247c5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncBaseMul.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncBaseMul.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.funcs; +package org.l2jmobius.gameserver.model.skills.funcs; -import org.l2jmobius.gameserver.skills.Env; -import org.l2jmobius.gameserver.skills.Stats; +import org.l2jmobius.gameserver.model.skills.Env; +import org.l2jmobius.gameserver.model.skills.Stats; /** * @author ProGramMoS diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncDiv.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncDiv.java similarity index 86% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncDiv.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncDiv.java index 905e09b203..d591b630c4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncDiv.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncDiv.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.funcs; +package org.l2jmobius.gameserver.model.skills.funcs; -import org.l2jmobius.gameserver.skills.Env; -import org.l2jmobius.gameserver.skills.Stats; +import org.l2jmobius.gameserver.model.skills.Env; +import org.l2jmobius.gameserver.model.skills.Stats; public class FuncDiv extends Func { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncEnchant.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncEnchant.java similarity index 96% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncEnchant.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncEnchant.java index 17d4057143..ae9a8f77c4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncEnchant.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncEnchant.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.funcs; +package org.l2jmobius.gameserver.model.skills.funcs; import org.l2jmobius.Config; 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.WeaponType; -import org.l2jmobius.gameserver.skills.Env; -import org.l2jmobius.gameserver.skills.Stats; +import org.l2jmobius.gameserver.model.skills.Env; +import org.l2jmobius.gameserver.model.skills.Stats; public class FuncEnchant extends Func { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncMul.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncMul.java similarity index 86% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncMul.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncMul.java index c9b801d26e..cdad229770 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncMul.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncMul.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.funcs; +package org.l2jmobius.gameserver.model.skills.funcs; -import org.l2jmobius.gameserver.skills.Env; -import org.l2jmobius.gameserver.skills.Stats; +import org.l2jmobius.gameserver.model.skills.Env; +import org.l2jmobius.gameserver.model.skills.Stats; public class FuncMul extends Func { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncSet.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncSet.java similarity index 86% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncSet.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncSet.java index 5ab49748f7..8036f024ed 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncSet.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncSet.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.funcs; +package org.l2jmobius.gameserver.model.skills.funcs; -import org.l2jmobius.gameserver.skills.Env; -import org.l2jmobius.gameserver.skills.Stats; +import org.l2jmobius.gameserver.model.skills.Env; +import org.l2jmobius.gameserver.model.skills.Stats; public class FuncSet extends Func { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncSub.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncSub.java similarity index 86% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncSub.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncSub.java index d99f31b2d8..32ef7be628 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncSub.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncSub.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.funcs; +package org.l2jmobius.gameserver.model.skills.funcs; -import org.l2jmobius.gameserver.skills.Env; -import org.l2jmobius.gameserver.skills.Stats; +import org.l2jmobius.gameserver.model.skills.Env; +import org.l2jmobius.gameserver.model.skills.Stats; public class FuncSub extends Func { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncTemplate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncTemplate.java similarity index 91% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncTemplate.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncTemplate.java index 31109afe7f..9dbe16d6ea 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncTemplate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncTemplate.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.funcs; +package org.l2jmobius.gameserver.model.skills.funcs; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; -import org.l2jmobius.gameserver.skills.Env; -import org.l2jmobius.gameserver.skills.Stats; -import org.l2jmobius.gameserver.skills.conditions.Condition; +import org.l2jmobius.gameserver.model.skills.Env; +import org.l2jmobius.gameserver.model.skills.Stats; +import org.l2jmobius.gameserver.model.skills.conditions.Condition; /** * @author mkizub diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/Lambda.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/Lambda.java similarity index 88% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/Lambda.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/Lambda.java index dbc7238f99..29c8850a6c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/Lambda.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/Lambda.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.funcs; +package org.l2jmobius.gameserver.model.skills.funcs; -import org.l2jmobius.gameserver.skills.Env; +import org.l2jmobius.gameserver.model.skills.Env; /** * @author mkizub diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/LambdaCalc.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/LambdaCalc.java similarity index 92% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/LambdaCalc.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/LambdaCalc.java index 10e126c3f7..3361ba20a1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/LambdaCalc.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/LambdaCalc.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.funcs; +package org.l2jmobius.gameserver.model.skills.funcs; -import org.l2jmobius.gameserver.skills.Env; +import org.l2jmobius.gameserver.model.skills.Env; /** * @author mkizub diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/LambdaConst.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/LambdaConst.java similarity index 90% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/LambdaConst.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/LambdaConst.java index 61ae70fd81..a75fa1de9f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/LambdaConst.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/LambdaConst.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.funcs; +package org.l2jmobius.gameserver.model.skills.funcs; -import org.l2jmobius.gameserver.skills.Env; +import org.l2jmobius.gameserver.model.skills.Env; /** * @author mkizub diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/LambdaRnd.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/LambdaRnd.java similarity index 91% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/LambdaRnd.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/LambdaRnd.java index efc31c7c84..7f430cfc65 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/LambdaRnd.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/LambdaRnd.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.funcs; +package org.l2jmobius.gameserver.model.skills.funcs; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.skills.Env; +import org.l2jmobius.gameserver.model.skills.Env; /** * @author mkizub diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/LambdaStats.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/LambdaStats.java similarity index 93% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/LambdaStats.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/LambdaStats.java index 2e3d0c6f54..520a95d3a6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/LambdaStats.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/LambdaStats.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.funcs; +package org.l2jmobius.gameserver.model.skills.funcs; -import org.l2jmobius.gameserver.skills.Env; +import org.l2jmobius.gameserver.model.skills.Env; /** * @author mkizub diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillCharge.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillCharge.java similarity index 95% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillCharge.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillCharge.java index 5c244a22d0..3203663f9f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillCharge.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillCharge.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.handlers; +package org.l2jmobius.gameserver.model.skills.handlers; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.StatsSet; 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.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.effects.EffectCharge; public class SkillCharge extends Skill { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillChargeDmg.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeDmg.java similarity index 95% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillChargeDmg.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeDmg.java index 224b214e07..99f101292e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillChargeDmg.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeDmg.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.handlers; +package org.l2jmobius.gameserver.model.skills.handlers; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; @@ -24,12 +24,12 @@ import org.l2jmobius.gameserver.model.actor.Creature; 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 SkillChargeDmg extends Skill { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillChargeEffect.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeEffect.java similarity index 95% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillChargeEffect.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeEffect.java index 81dabd0613..bc079b1e6f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillChargeEffect.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeEffect.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.handlers; +package org.l2jmobius.gameserver.model.skills.handlers; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.StatsSet; 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.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.effects.EffectCharge; public class SkillChargeEffect extends Skill { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillCreateItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillCreateItem.java similarity index 98% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillCreateItem.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillCreateItem.java index 4f8e4fc294..6fb21749f3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillCreateItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillCreateItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.handlers; +package org.l2jmobius.gameserver.model.skills.handlers; import java.util.List; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillDefault.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDefault.java similarity index 96% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillDefault.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDefault.java index 1aaba68567..c840666292 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillDefault.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDefault.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.handlers; +package org.l2jmobius.gameserver.model.skills.handlers; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.StatsSet; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillDrain.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDrain.java similarity index 98% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillDrain.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDrain.java index 9f609918d3..14eae2c816 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillDrain.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDrain.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.handlers; +package org.l2jmobius.gameserver.model.skills.handlers; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; @@ -24,10 +24,10 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.CubicInstance; 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; public class SkillDrain extends Skill { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillElemental.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillElemental.java similarity index 96% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillElemental.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillElemental.java index 836a343728..84d1525d06 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillElemental.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillElemental.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.handlers; +package org.l2jmobius.gameserver.model.skills.handlers; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +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 SkillElemental extends Skill { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillSeed.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSeed.java similarity index 93% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillSeed.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSeed.java index 94473378fe..edb13a7933 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillSeed.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSeed.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.handlers; +package org.l2jmobius.gameserver.model.skills.handlers; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.skills.effects.EffectSeed; +import org.l2jmobius.gameserver.model.skills.effects.EffectSeed; public class SkillSeed extends Skill { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillSignet.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignet.java similarity index 97% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillSignet.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignet.java index 35bc2453ae..bf4d06048d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillSignet.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignet.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.handlers; +package org.l2jmobius.gameserver.model.skills.handlers; import org.l2jmobius.gameserver.datatables.sql.NpcTable; import org.l2jmobius.gameserver.idfactory.IdFactory; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillSignetCasttime.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignetCasttime.java similarity index 95% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillSignetCasttime.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignetCasttime.java index a1a372acee..1275e5ce3f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillSignetCasttime.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignetCasttime.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.handlers; +package org.l2jmobius.gameserver.model.skills.handlers; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.StatsSet; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillSummon.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSummon.java similarity index 99% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillSummon.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSummon.java index 8055f00696..ea6961f2b1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillSummon.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSummon.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.handlers; +package org.l2jmobius.gameserver.model.skills.handlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.datatables.sql.NpcTable; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/hitConditionBonus.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/hitConditionBonus.java similarity index 98% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/hitConditionBonus.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/hitConditionBonus.java index 1e26cb4b5f..a11d919747 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/hitConditionBonus.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/hitConditionBonus.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills; +package org.l2jmobius.gameserver.model.skills; import java.io.File; import java.util.logging.Logger; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/holders/ISkillsHolder.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/holders/ISkillsHolder.java similarity index 94% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/holders/ISkillsHolder.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/holders/ISkillsHolder.java index 02bdcd6c4e..1be890269b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/holders/ISkillsHolder.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/holders/ISkillsHolder.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.holders; +package org.l2jmobius.gameserver.model.skills.holders; import java.util.Map; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/holders/PlayerSkillHolder.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/holders/PlayerSkillHolder.java similarity index 97% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/holders/PlayerSkillHolder.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/holders/PlayerSkillHolder.java index bf07796fd2..1b3e43b44d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/holders/PlayerSkillHolder.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/holders/PlayerSkillHolder.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.holders; +package org.l2jmobius.gameserver.model.skills.holders; import java.util.HashMap; import java.util.Map; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/holders/SkillHolder.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/holders/SkillHolder.java similarity index 96% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/holders/SkillHolder.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/holders/SkillHolder.java index 41b46f0166..320231e268 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/holders/SkillHolder.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/holders/SkillHolder.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.skills.holders; +package org.l2jmobius.gameserver.model.skills.holders; import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.model.Skill; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java index 2290e07062..70937b2071 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java @@ -18,8 +18,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.skills.effects.EffectCharge; import org.l2jmobius.gameserver.model.zone.ZoneId; -import org.l2jmobius.gameserver.skills.effects.EffectCharge; /* Packet format: F3 XX000000 YY000000 ZZ000000 */