From a0d40acf6bc505e775405f50c64e22bf22a77d5d Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 23 Aug 2019 12:21:38 +0000 Subject: [PATCH] Removed templates package. --- .../game/data/scripts/ai/bosses/Antharas.java | 2 +- .../data/scripts/ai/bosses/IceFairySirra.java | 2 +- .../game/data/scripts/ai/bosses/VanHalter.java | 2 +- .../data/scripts/ai/others/FeedableBeasts.java | 2 +- .../custom/RaidbossInfo/RaidbossInfo.java | 2 +- .../Q415_PathToAMonk/Q415_PathToAMonk.java | 4 ++-- .../Q662_AGameOfCards/Q662_AGameOfCards.java | 2 +- .../l2jmobius/gameserver/ai/AttackableAI.java | 4 ++-- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 2 +- .../gameserver/datatables/SkillTable.java | 2 +- .../gameserver/datatables/csv/DoorTable.java | 2 +- .../gameserver/datatables/csv/HennaTable.java | 2 +- .../datatables/sql/CharTemplateTable.java | 2 +- .../datatables/sql/HelperBuffTable.java | 10 +++++----- .../datatables/sql/HennaTreeTable.java | 2 +- .../gameserver/datatables/sql/NpcTable.java | 2 +- .../gameserver/datatables/sql/SpawnTable.java | 2 +- .../gameserver/datatables/xml/ItemTable.java | 8 ++++---- .../gameserver/engines/DocumentBase.java | 8 ++++---- .../gameserver/engines/DocumentEngine.java | 2 +- .../gameserver/engines/DocumentItem.java | 14 +++++++------- .../gameserver/engines/ItemDataHolder.java | 2 +- .../admincommandhandlers/AdminCreateItem.java | 2 +- .../admincommandhandlers/AdminEditNpc.java | 4 ++-- .../AdminFightCalculator.java | 2 +- .../admincommandhandlers/AdminMobGroup.java | 2 +- .../handler/admincommandhandlers/AdminSpawn.java | 2 +- .../admincommandhandlers/AdminTeleport.java | 2 +- .../handler/itemhandlers/BeastSoulShot.java | 2 +- .../handler/itemhandlers/BeastSpiritShot.java | 2 +- .../handler/itemhandlers/BlessedSpiritShot.java | 4 ++-- .../handler/itemhandlers/ChristmasTree.java | 2 +- .../handler/itemhandlers/FishShots.java | 6 +++--- .../handler/itemhandlers/JackpotSeed.java | 2 +- .../handler/itemhandlers/SoulShots.java | 4 ++-- .../handler/itemhandlers/SpiritShot.java | 4 ++-- .../handler/itemhandlers/SummonItems.java | 2 +- .../gameserver/handler/skillhandlers/Blow.java | 2 +- .../handler/skillhandlers/Fishing.java | 4 ++-- .../handler/skillhandlers/FishingSkill.java | 4 ++-- .../gameserver/handler/skillhandlers/Pdam.java | 2 +- .../handler/skillhandlers/StrSiegeAssault.java | 2 +- .../gameserver/instancemanager/BoatManager.java | 2 +- .../instancemanager/ChristmasManager.java | 2 +- .../instancemanager/DimensionalRiftManager.java | 2 +- .../instancemanager/FortSiegeGuardManager.java | 2 +- .../instancemanager/FourSepulchersManager.java | 2 +- .../instancemanager/GrandBossManager.java | 2 +- .../instancemanager/ItemsOnGroundManager.java | 2 +- .../instancemanager/MercTicketManager.java | 2 +- .../instancemanager/RaidBossSpawnManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../l2jmobius/gameserver/model/CursedWeapon.java | 2 +- .../org/l2jmobius/gameserver/model/Fishing.java | 2 +- .../l2jmobius/gameserver/model/Inventory.java | 12 ++++++------ .../gameserver/model/ItemContainer.java | 2 +- .../org/l2jmobius/gameserver/model/ItemInfo.java | 2 +- .../org/l2jmobius/gameserver/model/Manor.java | 2 +- .../org/l2jmobius/gameserver/model/MobGroup.java | 2 +- .../gameserver/model/PlayerInventory.java | 4 ++-- .../l2jmobius/gameserver/model/ShortCuts.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 4 ++-- .../gameserver/model/actor/Attackable.java | 6 +++--- .../gameserver/model/actor/Creature.java | 8 ++++---- .../gameserver/model/actor/Playable.java | 2 +- .../l2jmobius/gameserver/model/actor/Summon.java | 4 ++-- .../model/actor/instance/AdventurerInstance.java | 2 +- .../model/actor/instance/ArtefactInstance.java | 2 +- .../model/actor/instance/AuctioneerInstance.java | 2 +- .../model/actor/instance/BabyPetInstance.java | 2 +- .../model/actor/instance/BlacksmithInstance.java | 2 +- .../model/actor/instance/BoatInstance.java | 4 ++-- .../model/actor/instance/BoxInstance.java | 2 +- .../actor/instance/CabaleBufferInstance.java | 2 +- .../actor/instance/CastleBlacksmithInstance.java | 2 +- .../instance/CastleChamberlainInstance.java | 2 +- .../actor/instance/CastleMagicianInstance.java | 2 +- .../actor/instance/CastleTeleporterInstance.java | 2 +- .../actor/instance/CastleWarehouseInstance.java | 2 +- .../model/actor/instance/ChestInstance.java | 2 +- .../actor/instance/ClanHallManagerInstance.java | 2 +- .../actor/instance/ClanHallSiegeInfInstance.java | 2 +- .../actor/instance/ClassMasterInstance.java | 2 +- .../model/actor/instance/CommanderInstance.java | 2 +- .../actor/instance/ControlTowerInstance.java | 2 +- .../actor/instance/ControllableMobInstance.java | 2 +- .../model/actor/instance/CustomNpcInstance.java | 2 +- .../model/actor/instance/DecoInstance.java | 2 +- .../model/actor/instance/DoorInstance.java | 4 ++-- .../model/actor/instance/DoormanInstance.java | 2 +- .../actor/instance/EffectPointInstance.java | 2 +- .../actor/instance/FeedableBeastInstance.java | 2 +- .../actor/instance/FestivalGuideInstance.java | 2 +- .../actor/instance/FestivalMonsterInstance.java | 2 +- .../model/actor/instance/FishermanInstance.java | 2 +- .../model/actor/instance/FolkInstance.java | 2 +- .../actor/instance/FortManagerInstance.java | 2 +- .../actor/instance/FortMerchantInstance.java | 2 +- .../actor/instance/FortSiegeGuardInstance.java | 2 +- .../instance/FortWyvernManagerInstance.java | 2 +- .../actor/instance/FriendlyMobInstance.java | 2 +- .../model/actor/instance/GourdInstance.java | 2 +- .../model/actor/instance/GrandBossInstance.java | 2 +- .../model/actor/instance/GuardInstance.java | 2 +- .../actor/instance/GuardNoHTMLInstance.java | 2 +- .../model/actor/instance/HennaInstance.java | 2 +- .../model/actor/instance/ItemInstance.java | 8 ++++---- .../actor/instance/ManorManagerInstance.java | 2 +- .../actor/instance/MercManagerInstance.java | 2 +- .../model/actor/instance/MerchantInstance.java | 2 +- .../model/actor/instance/MinionInstance.java | 2 +- .../model/actor/instance/MonsterInstance.java | 2 +- .../model/actor/instance/NpcInstance.java | 12 ++++++------ .../model/actor/instance/NpcWalkerInstance.java | 2 +- .../actor/instance/ObservationInstance.java | 2 +- .../actor/instance/OlympiadManagerInstance.java | 2 +- .../actor/instance/PenaltyMonsterInstance.java | 2 +- .../model/actor/instance/PetInstance.java | 6 +++--- .../model/actor/instance/PlayerInstance.java | 16 ++++++++-------- .../model/actor/instance/ProtectorInstance.java | 2 +- .../actor/instance/RaceManagerInstance.java | 2 +- .../model/actor/instance/RaidBossInstance.java | 2 +- .../actor/instance/RaidBossManagerInstance.java | 2 +- .../actor/instance/RiftInvaderInstance.java | 2 +- .../actor/instance/SchemeBufferInstance.java | 2 +- .../actor/instance/SepulcherMonsterInstance.java | 2 +- .../actor/instance/SepulcherNpcInstance.java | 2 +- .../model/actor/instance/SiegeFlagInstance.java | 2 +- .../model/actor/instance/SiegeGuardInstance.java | 2 +- .../model/actor/instance/SiegeNpcInstance.java | 2 +- .../actor/instance/SiegeSummonInstance.java | 2 +- .../actor/instance/SignsPriestInstance.java | 2 +- .../model/actor/instance/SummonInstance.java | 2 +- .../actor/instance/SymbolMakerInstance.java | 2 +- .../model/actor/instance/TamedBeastInstance.java | 2 +- .../model/actor/instance/TeleporterInstance.java | 2 +- .../model/actor/instance/TownPetInstance.java | 2 +- .../model/actor/instance/TrainerInstance.java | 2 +- .../actor/instance/VillageMasterInstance.java | 2 +- .../model/actor/instance/WarehouseInstance.java | 2 +- .../actor/instance/WeddingManagerInstance.java | 2 +- .../actor/instance/WyvernManagerInstance.java | 2 +- .../model/actor/instance/XmassTreeInstance.java | 2 +- .../actor/templates}/CreatureTemplate.java | 2 +- .../actor/templates}/NpcTemplate.java | 2 +- .../actor/templates}/PlayerTemplate.java | 4 ++-- .../l2jmobius/gameserver/model/entity/Hero.java | 2 +- .../gameserver/model/entity/MonsterRace.java | 2 +- .../gameserver/model/entity/event/CTF.java | 2 +- .../gameserver/model/entity/event/DM.java | 2 +- .../gameserver/model/entity/event/GameEvent.java | 2 +- .../gameserver/model/entity/event/TvT.java | 2 +- .../gameserver/model/entity/event/VIP.java | 4 ++-- .../entity/sevensigns/SevenSignsFestival.java | 2 +- .../gameserver/model/entity/siege/Siege.java | 2 +- .../siege/clanhalls/BanditStrongholdSiege.java | 2 +- .../entity/siege/clanhalls/DevastatedCastle.java | 2 +- .../siege/clanhalls/FortressOfResistance.java | 2 +- .../siege/clanhalls/WildBeastFarmSiege.java | 2 +- .../holders/HelperBuffHolder.java} | 6 +++--- .../{templates/item => model/items}/Armor.java | 3 ++- .../{templates/item => model/items}/EtcItem.java | 3 ++- .../{templates/item => model/items}/Henna.java | 2 +- .../{templates/item => model/items}/Item.java | 3 ++- .../{templates/item => model/items}/Weapon.java | 3 ++- .../item => model/items/type}/ArmorType.java | 2 +- .../item => model/items/type}/EtcItemType.java | 2 +- .../item => model/items/type}/ItemType.java | 2 +- .../item => model/items/type}/WeaponType.java | 2 +- .../gameserver/model/multisell/Multisell.java | 6 +++--- .../l2jmobius/gameserver/model/quest/Quest.java | 2 +- .../gameserver/model/quest/QuestSpawn.java | 2 +- .../gameserver/model/spawn/AutoSpawn.java | 2 +- .../gameserver/model/spawn/GroupSpawn.java | 2 +- .../l2jmobius/gameserver/model/spawn/Spawn.java | 2 +- .../network/clientpackets/CharacterCreate.java | 4 ++-- .../network/clientpackets/MultiSellChoose.java | 6 +++--- .../network/clientpackets/NewCharacter.java | 2 +- .../network/clientpackets/RequestBuyItem.java | 2 +- .../network/clientpackets/RequestBuyProcure.java | 2 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestConfirmCancelItem.java | 2 +- .../clientpackets/RequestConfirmGemStone.java | 2 +- .../clientpackets/RequestConfirmRefinerItem.java | 2 +- .../clientpackets/RequestConfirmTargetItem.java | 2 +- .../clientpackets/RequestCrystallizeItem.java | 2 +- .../network/clientpackets/RequestDropItem.java | 4 ++-- .../clientpackets/RequestEnchantItem.java | 4 ++-- .../network/clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestMoveToLocationInVehicle.java | 2 +- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestProcureCropList.java | 2 +- .../network/clientpackets/RequestRefine.java | 2 +- .../clientpackets/RequestRefineCancel.java | 2 +- .../clientpackets/RequestUnEquipItem.java | 2 +- .../network/clientpackets/RequestWearItem.java | 2 +- .../clientpackets/SendWareHouseDepositList.java | 2 +- .../network/clientpackets/UseItem.java | 6 +++--- .../network/serverpackets/BuyList.java | 2 +- .../network/serverpackets/CharInfo.java | 2 +- .../network/serverpackets/CharTemplates.java | 2 +- .../network/serverpackets/EquipUpdate.java | 2 +- .../GMViewWarehouseWithdrawList.java | 4 ++-- .../network/serverpackets/NpcInfoPoly.java | 2 +- .../network/serverpackets/UserInfo.java | 2 +- .../network/serverpackets/WearList.java | 2 +- .../script/faenor/FaenorInterface.java | 2 +- .../l2jmobius/gameserver/skills/Formulas.java | 12 ++++++------ .../conditions/ConditionTargetBodyPart.java | 4 ++-- .../ConditionTargetUsesWeaponKind.java | 2 +- .../conditions/ConditionUsingItemType.java | 4 ++-- .../skills/effects/EffectSignetMDam.java | 2 +- .../gameserver/skills/funcs/FuncEnchant.java | 4 ++-- .../skills/handlers/SkillChargeDmg.java | 2 +- .../gameserver/skills/handlers/SkillSignet.java | 2 +- .../gameserver/skills/handlers/SkillSummon.java | 2 +- .../thread/daemons/ItemsAutoDestroy.java | 2 +- .../l2jmobius/gameserver/util/MinionList.java | 2 +- 219 files changed, 303 insertions(+), 299 deletions(-) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{templates/creatures => model/actor/templates}/CreatureTemplate.java (98%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{templates/creatures => model/actor/templates}/NpcTemplate.java (99%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{templates/creatures => model/actor/templates}/PlayerTemplate.java (96%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{templates/HelperBuff.java => model/holders/HelperBuffHolder.java} (96%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{templates/item => model/items}/Armor.java (97%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{templates/item => model/items}/EtcItem.java (94%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{templates/item => model/items}/Henna.java (97%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{templates/item => model/items}/Item.java (99%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{templates/item => model/items}/Weapon.java (99%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{templates/item => model/items/type}/ArmorType.java (96%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{templates/item => model/items/type}/EtcItemType.java (96%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{templates/item => model/items/type}/ItemType.java (90%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{templates/item => model/items/type}/WeaponType.java (97%) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java index f827ce6358..e0831e13f8 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java @@ -40,6 +40,7 @@ import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; 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.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.model.zone.type.BossZone; @@ -47,7 +48,6 @@ import org.l2jmobius.gameserver.network.serverpackets.Earthquake; import org.l2jmobius.gameserver.network.serverpackets.GameServerPacket; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.SpecialCamera; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * @version $Revision: $ $Date: $ diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/IceFairySirra.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/IceFairySirra.java index 3ac0989a18..f911e9695f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/IceFairySirra.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/IceFairySirra.java @@ -30,13 +30,13 @@ import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.model.zone.type.BossZone; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * Ice Fairy Sirra AI diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java index 3b40097487..250aba6f8f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java @@ -46,11 +46,11 @@ 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.actor.instance.RaidBossInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.network.serverpackets.SpecialCamera; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * @author L2J_JP SANDMAN diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/FeedableBeasts.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/FeedableBeasts.java index 1ed9e3842e..f20c0b5314 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/FeedableBeasts.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/FeedableBeasts.java @@ -29,11 +29,11 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.TamedBeastInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; import org.l2jmobius.gameserver.util.Util; import quests.Q020_BringUpWithLove.Q020_BringUpWithLove; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java index 2db6a35df3..9c97fe5299 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java @@ -24,10 +24,10 @@ import org.l2jmobius.gameserver.datatables.sql.SpawnTable; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.spawn.Spawn; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; import org.l2jmobius.gameserver.util.Util; public class RaidbossInfo extends Quest diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q415_PathToAMonk/Q415_PathToAMonk.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q415_PathToAMonk/Q415_PathToAMonk.java index 0afedb7470..e721c2cd12 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q415_PathToAMonk/Q415_PathToAMonk.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q415_PathToAMonk/Q415_PathToAMonk.java @@ -19,12 +19,12 @@ package quests.Q415_PathToAMonk; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.ClassId; +import org.l2jmobius.gameserver.model.items.Weapon; +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.network.serverpackets.SocialAction; -import org.l2jmobius.gameserver.templates.item.Weapon; -import org.l2jmobius.gameserver.templates.item.WeaponType; public class Q415_PathToAMonk extends Quest { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q662_AGameOfCards/Q662_AGameOfCards.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q662_AGameOfCards/Q662_AGameOfCards.java index 3dff851500..c0dd115d44 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q662_AGameOfCards/Q662_AGameOfCards.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q662_AGameOfCards/Q662_AGameOfCards.java @@ -23,10 +23,10 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.Item; 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.templates.item.Item; public class Q662_AGameOfCards extends Quest { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 8f161de962..f2e8c4d5e1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -50,9 +50,9 @@ import org.l2jmobius.gameserver.model.actor.instance.PenaltyMonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.RaidBossInstance; import org.l2jmobius.gameserver.model.actor.instance.RiftInvaderInstance; +import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.quest.Quest; -import org.l2jmobius.gameserver.templates.item.Weapon; -import org.l2jmobius.gameserver.templates.item.WeaponType; /** * This class manages AI of Attackable.
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java index d1920d98aa..03d89f252b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -38,10 +38,10 @@ import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; -import org.l2jmobius.gameserver.templates.item.WeaponType; /** * This class manages AI of Creature.
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/SkillTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/SkillTable.java index 62fbb39220..5d68637143 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/SkillTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/SkillTable.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.gameserver.engines.DocumentEngine; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.templates.item.WeaponType; +import org.l2jmobius.gameserver.model.items.type.WeaponType; public class SkillTable { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/csv/DoorTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/csv/DoorTable.java index db33567bff..0e2bed4c85 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/csv/DoorTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/csv/DoorTable.java @@ -33,8 +33,8 @@ import org.l2jmobius.gameserver.instancemanager.ClanHallManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; +import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.templates.creatures.CreatureTemplate; public class DoorTable { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/csv/HennaTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/csv/HennaTable.java index 44b6431d29..7217c782f3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/csv/HennaTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/csv/HennaTable.java @@ -29,7 +29,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.StatsSet; -import org.l2jmobius.gameserver.templates.item.Henna; +import org.l2jmobius.gameserver.model.items.Henna; /** * @version $Revision$ $Date$ diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/CharTemplateTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/CharTemplateTable.java index cc69674b3f..f5c5fccc70 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/CharTemplateTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/CharTemplateTable.java @@ -26,8 +26,8 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.templates.creatures.PlayerTemplate; /** * @version $Revision: 1.6.2.1.2.10 $ $Date: 2005/03/29 14:00:54 $ diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/HelperBuffTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/HelperBuffTable.java index 117303f09c..d3eda7bb04 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/HelperBuffTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/HelperBuffTable.java @@ -26,7 +26,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.datatables.csv.HennaTable; import org.l2jmobius.gameserver.model.StatsSet; -import org.l2jmobius.gameserver.templates.HelperBuff; +import org.l2jmobius.gameserver.model.holders.HelperBuffHolder; /** * This class represents the Newbie Helper Buff list. Author: Ayor @@ -36,7 +36,7 @@ public class HelperBuffTable private static final Logger LOGGER = Logger.getLogger(HennaTable.class.getName()); private static HelperBuffTable _instance; - public List helperBuff; + public List helperBuff; private final boolean _initialized = true; private int _magicClassLowestLevel = 100; private int _physicClassLowestLevel = 100; @@ -134,7 +134,7 @@ public class HelperBuffTable } // Add this Helper Buff to the Helper Buff List - final HelperBuff template = new HelperBuff(helperBuffDat); + final HelperBuffHolder template = new HelperBuffHolder(helperBuffDat); helperBuff.add(template); } @@ -146,7 +146,7 @@ public class HelperBuffTable return _initialized; } - public HelperBuff getHelperBuffTableItem(int id) + public HelperBuffHolder getHelperBuffTableItem(int id) { return helperBuff.get(id); } @@ -154,7 +154,7 @@ public class HelperBuffTable /** * @return the Helper Buff List */ - public List getHelperBuffTable() + public List getHelperBuffTable() { return helperBuff; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/HennaTreeTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/HennaTreeTable.java index 0d05f4ed3d..93c87702d7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/HennaTreeTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/HennaTreeTable.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.datatables.csv.HennaTable; import org.l2jmobius.gameserver.model.actor.instance.HennaInstance; import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.templates.item.Henna; +import org.l2jmobius.gameserver.model.items.Henna; public class HennaTreeTable { 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 7a3a9194ec..c2b823beec 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 @@ -34,10 +34,10 @@ import org.l2jmobius.gameserver.model.DropData; import org.l2jmobius.gameserver.model.MinionData; 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.templates.creatures.NpcTemplate; /** * @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/SpawnTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/SpawnTable.java index 75a3aafe1f..263ad7252e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/SpawnTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/SpawnTable.java @@ -27,9 +27,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.instancemanager.DayNightSpawnManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.olympiad.Olympiad; import org.l2jmobius.gameserver.model.spawn.Spawn; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * @author Nightmare diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/ItemTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/ItemTable.java index 4fae721bac..fd8b4f9dce 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/ItemTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/ItemTable.java @@ -41,10 +41,10 @@ import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.RaidBossInstance; -import org.l2jmobius.gameserver.templates.item.Armor; -import org.l2jmobius.gameserver.templates.item.EtcItem; -import org.l2jmobius.gameserver.templates.item.Item; -import org.l2jmobius.gameserver.templates.item.Weapon; +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; /** * @version $Revision: 1.9.2.6.2.9 $ $Date: 2005/04/02 15:57:34 $ 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 cfbe8dba81..cfe8fabe31 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 @@ -37,6 +37,10 @@ import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.Race; +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; @@ -72,10 +76,6 @@ 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.templates.item.ArmorType; -import org.l2jmobius.gameserver.templates.item.Item; -import org.l2jmobius.gameserver.templates.item.Weapon; -import org.l2jmobius.gameserver.templates.item.WeaponType; /** * @author mkizub diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentEngine.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentEngine.java index f70da242ba..988438295e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentEngine.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentEngine.java @@ -25,7 +25,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.templates.item.Item; +import org.l2jmobius.gameserver.model.items.Item; /** * @author mkizub diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentItem.java index 1f1bf2d2d5..81e54552ed 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentItem.java @@ -27,13 +27,13 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.gameserver.model.StatsSet; -import org.l2jmobius.gameserver.templates.item.Armor; -import org.l2jmobius.gameserver.templates.item.ArmorType; -import org.l2jmobius.gameserver.templates.item.EtcItem; -import org.l2jmobius.gameserver.templates.item.EtcItemType; -import org.l2jmobius.gameserver.templates.item.Item; -import org.l2jmobius.gameserver.templates.item.Weapon; -import org.l2jmobius.gameserver.templates.item.WeaponType; +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.items.type.ArmorType; +import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.items.type.WeaponType; /** * @author mkizub, JIV diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/ItemDataHolder.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/ItemDataHolder.java index 1a6e6994da..7b67f999bb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/ItemDataHolder.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/ItemDataHolder.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.engines; import org.l2jmobius.gameserver.model.StatsSet; -import org.l2jmobius.gameserver.templates.item.Item; +import org.l2jmobius.gameserver.model.items.Item; /** * @author luisantonioa diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java index 0d421a7f30..057f281b66 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.item.Item; import org.l2jmobius.gameserver.util.BuilderUtil; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java index a454ac74fe..6f14ff880a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java @@ -45,9 +45,9 @@ import org.l2jmobius.gameserver.model.actor.instance.BoxInstance; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; -import org.l2jmobius.gameserver.templates.item.Item; import org.l2jmobius.gameserver.util.BuilderUtil; /** 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 32b64ecdc4..90f5c55bc6 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 @@ -25,10 +25,10 @@ import org.l2jmobius.gameserver.idfactory.IdFactory; 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.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.skills.Formulas; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * This class handles following admin commands: - gm = turns gm mode on/off diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMobGroup.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMobGroup.java index e2779ea407..4ecee26995 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMobGroup.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMobGroup.java @@ -23,10 +23,10 @@ import org.l2jmobius.gameserver.model.MobGroup; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.network.serverpackets.SetupGauge; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; import org.l2jmobius.gameserver.util.Broadcast; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSpawn.java index 9c76fedc03..f0478b813c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSpawn.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSpawn.java @@ -36,11 +36,11 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSigns; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; import org.l2jmobius.gameserver.util.BuilderUtil; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTeleport.java index a1c7a6a99b..6809c777bf 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTeleport.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTeleport.java @@ -29,11 +29,11 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; import org.l2jmobius.gameserver.util.BuilderUtil; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSoulShot.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSoulShot.java index c8bbbe7d9b..4349745944 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSoulShot.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.model.actor.instance.BabyPetInstance; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.Weapon; 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.templates.item.Weapon; import org.l2jmobius.gameserver.util.Broadcast; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpiritShot.java index 013bdfb110..50fa05c219 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpiritShot.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.model.actor.instance.BabyPetInstance; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.Weapon; 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.templates.item.Weapon; import org.l2jmobius.gameserver.util.Broadcast; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BlessedSpiritShot.java index 070ba0d53a..7fe75df3bc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BlessedSpiritShot.java @@ -21,12 +21,12 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; 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.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.templates.item.Item; -import org.l2jmobius.gameserver.templates.item.Weapon; import org.l2jmobius.gameserver.util.Broadcast; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ChristmasTree.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ChristmasTree.java index 564e16904d..ac836c4212 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ChristmasTree.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ChristmasTree.java @@ -25,10 +25,10 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class ChristmasTree implements IItemHandler { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/FishShots.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/FishShots.java index 03ad773967..523896f987 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/FishShots.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/FishShots.java @@ -21,11 +21,11 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; 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.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; -import org.l2jmobius.gameserver.templates.item.Item; -import org.l2jmobius.gameserver.templates.item.Weapon; -import org.l2jmobius.gameserver.templates.item.WeaponType; import org.l2jmobius.gameserver.util.Broadcast; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/JackpotSeed.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/JackpotSeed.java index 45b6019abb..745b8f00a1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/JackpotSeed.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/JackpotSeed.java @@ -24,10 +24,10 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.GourdInstance; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class JackpotSeed 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 247ab0362a..99aef56f4e 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 @@ -21,13 +21,13 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; 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.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.templates.item.Item; -import org.l2jmobius.gameserver.templates.item.Weapon; import org.l2jmobius.gameserver.util.Broadcast; public class SoulShots implements IItemHandler diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SpiritShot.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SpiritShot.java index 5ea12f9a33..cbf3a61dbb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SpiritShot.java @@ -21,12 +21,12 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; 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.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.templates.item.Item; -import org.l2jmobius.gameserver.templates.item.Weapon; import org.l2jmobius.gameserver.util.Broadcast; public class SpiritShot implements IItemHandler diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java index 97b071e905..94d9cf1d85 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance.SkillDat; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.event.CTF; import org.l2jmobius.gameserver.model.entity.event.DM; import org.l2jmobius.gameserver.model.entity.event.TvT; @@ -40,7 +41,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; import org.l2jmobius.gameserver.network.serverpackets.PetInfo; import org.l2jmobius.gameserver.network.serverpackets.Ride; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class SummonItems 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 e92280d5b3..ccd1f10ba5 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 @@ -29,13 +29,13 @@ import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SummonInstance; import org.l2jmobius.gameserver.model.entity.olympiad.Olympiad; +import org.l2jmobius.gameserver.model.items.type.WeaponType; 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.templates.item.WeaponType; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Fishing.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Fishing.java index 65b1582408..9cdc5de4ec 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Fishing.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Fishing.java @@ -29,13 +29,13 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.zone.type.FishingZone; import org.l2jmobius.gameserver.model.zone.type.WaterZone; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.item.Weapon; -import org.l2jmobius.gameserver.templates.item.WeaponType; import org.l2jmobius.gameserver.util.Util; public class Fishing implements ISkillHandler diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/FishingSkill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/FishingSkill.java index 42aaf58ff2..fad2380bbb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/FishingSkill.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/FishingSkill.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.item.Weapon; -import org.l2jmobius.gameserver.templates.item.WeaponType; public class FishingSkill 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 3eab064bcf..8cf503c170 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 @@ -33,13 +33,13 @@ import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; 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.type.WeaponType; 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; -import org.l2jmobius.gameserver.templates.item.WeaponType; public class Pdam implements ISkillHandler { 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 84e84c9afa..7b4cf316a5 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 @@ -28,10 +28,10 @@ import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.entity.siege.Castle; import org.l2jmobius.gameserver.model.entity.siege.Fort; +import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.skills.Formulas; -import org.l2jmobius.gameserver.templates.item.WeaponType; /** * @author _tomciaaa_ diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java index a3145d564e..0f94cd053b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java @@ -30,7 +30,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.actor.instance.BoatInstance; -import org.l2jmobius.gameserver.templates.creatures.CreatureTemplate; +import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; public class BoatManager { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ChristmasManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ChristmasManager.java index e4d570609d..294272a392 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ChristmasManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ChristmasManager.java @@ -33,12 +33,12 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.Announcements; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * Control for sequence of Christmas. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java index 6d91487881..b9f2f1aad3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java @@ -43,10 +43,10 @@ import org.l2jmobius.gameserver.datatables.sql.SpawnTable; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.DimensionalRift; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortSiegeGuardManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortSiegeGuardManager.java index 8923c6ce5d..b7673362b2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortSiegeGuardManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortSiegeGuardManager.java @@ -26,9 +26,9 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.datatables.sql.NpcTable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.siege.Fort; import org.l2jmobius.gameserver.model.spawn.Spawn; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * @author programmos, scoria dev diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java index 137de91930..dfe502a42e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java @@ -40,12 +40,12 @@ import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SepulcherMonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.SepulcherNpcInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.model.zone.type.BossZone; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java index ef05110afa..697a6c3ae5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java @@ -33,8 +33,8 @@ 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.GrandBossInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.zone.type.BossZone; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * This class handles all Grand Bosses: diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 7eb80ba579..291a29b828 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -30,7 +30,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; -import org.l2jmobius.gameserver.templates.item.EtcItemType; +import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.thread.daemons.ItemsAutoDestroy; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/MercTicketManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/MercTicketManager.java index edc23d3ccc..31c1564ea2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/MercTicketManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/MercTicketManager.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeGuardInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.siege.Castle; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * @author yellowperil & Fulminus This class is similar to the SiegeGuardManager, except it handles the loading of the mercenary tickets that are dropped on castle floors by the castle lords. These tickets (aka badges) need to be readded after each server reboot except when the server crashed in the 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 ba3733bdbd..31c595020a 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 @@ -37,10 +37,10 @@ import org.l2jmobius.gameserver.datatables.xml.AdminData; import org.l2jmobius.gameserver.enums.RaidBossStatus; 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.spawn.Spawn; import org.l2jmobius.gameserver.skills.Stats; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * Raid Boss spawn manager. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index ca4c6b8657..1d49f86bce 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -26,9 +26,9 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.datatables.sql.NpcTable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.siege.Castle; import org.l2jmobius.gameserver.model.spawn.Spawn; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class SiegeGuardManager { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java index b80491e141..1df31c3735 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; 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.items.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Earthquake; import org.l2jmobius.gameserver.network.serverpackets.ExRedSky; @@ -42,7 +43,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.Ride; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.item.Item; public class CursedWeapon { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Fishing.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Fishing.java index 0abebbdcff..abb84f8838 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Fishing.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Fishing.java @@ -24,13 +24,13 @@ import org.l2jmobius.gameserver.datatables.sql.NpcTable; import org.l2jmobius.gameserver.instancemanager.FishingChampionshipManager; import org.l2jmobius.gameserver.model.actor.instance.PenaltyMonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExFishingHpRegen; import org.l2jmobius.gameserver.network.serverpackets.ExFishingStartCombat; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class Fishing implements Runnable { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Inventory.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Inventory.java index 1d36d3b131..be48454c23 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Inventory.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Inventory.java @@ -29,12 +29,12 @@ import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.templates.item.Armor; -import org.l2jmobius.gameserver.templates.item.EtcItem; -import org.l2jmobius.gameserver.templates.item.EtcItemType; -import org.l2jmobius.gameserver.templates.item.Item; -import org.l2jmobius.gameserver.templates.item.Weapon; -import org.l2jmobius.gameserver.templates.item.WeaponType; +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.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.items.type.WeaponType; /** * This class manages inventory diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ItemContainer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ItemContainer.java index e05a849501..5a06894d15 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ItemContainer.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ItemContainer.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.templates.item.Item; +import org.l2jmobius.gameserver.model.items.Item; /** * @author Advi diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ItemInfo.java index 345fac3642..e2ddaa8ef1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; -import org.l2jmobius.gameserver.templates.item.Item; +import org.l2jmobius.gameserver.model.items.Item; /** * Get all information from ItemInstance to generate ItemInfo.
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Manor.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Manor.java index 8c32fbdbee..cf3df14051 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Manor.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Manor.java @@ -30,7 +30,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.datatables.xml.ItemTable; -import org.l2jmobius.gameserver.templates.item.Item; +import org.l2jmobius.gameserver.model.items.Item; /** * Service class for manor diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/MobGroup.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/MobGroup.java index f1bc946aac..3522b1c123 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/MobGroup.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/MobGroup.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.datatables.sql.SpawnTable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ControllableMobInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.spawn.GroupSpawn; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * @author littlecrow diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/PlayerInventory.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/PlayerInventory.java index cb8a5e55ef..ede3476ea3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/PlayerInventory.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/PlayerInventory.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.TradeList.TradeItem; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.templates.item.EtcItemType; -import org.l2jmobius.gameserver.templates.item.Item; +import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.items.type.EtcItemType; public class PlayerInventory extends Inventory { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ShortCuts.java index 776e7bc6fd..8336f9d4cc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -26,9 +26,9 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; -import org.l2jmobius.gameserver.templates.item.EtcItemType; /** * @version $Revision: 1.1.2.1.2.3 $ $Date: 2005/03/27 15:29:33 $ diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java index 8e9c35eac8..3aba1b2453 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java @@ -25,13 +25,13 @@ import org.l2jmobius.gameserver.datatables.OfflineTradeTable; import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.item.EtcItemType; -import org.l2jmobius.gameserver.templates.item.Item; 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 11a72e01cd..2192a8982b 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 @@ -51,7 +51,10 @@ import org.l2jmobius.gameserver.model.actor.instance.RaidBossInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeGuardInstance; import org.l2jmobius.gameserver.model.actor.instance.SummonInstance; import org.l2jmobius.gameserver.model.actor.knownlist.AttackableKnownList; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.base.SoulCrystal; +import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.Say2; @@ -61,9 +64,6 @@ 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.templates.creatures.NpcTemplate; -import org.l2jmobius.gameserver.templates.item.EtcItemType; -import org.l2jmobius.gameserver.templates.item.Item; import org.l2jmobius.gameserver.thread.daemons.ItemsAutoDestroy; 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 3c68819494..de3a85782e 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 @@ -86,6 +86,8 @@ import org.l2jmobius.gameserver.model.actor.knownlist.CreatureKnownList; import org.l2jmobius.gameserver.model.actor.knownlist.WorldObjectKnownList.KnownListAsynchronousUpdateTask; import org.l2jmobius.gameserver.model.actor.stat.CreatureStat; import org.l2jmobius.gameserver.model.actor.status.CreatureStatus; +import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.Duel; import org.l2jmobius.gameserver.model.entity.event.CTF; import org.l2jmobius.gameserver.model.entity.event.DM; @@ -93,6 +95,8 @@ import org.l2jmobius.gameserver.model.entity.event.GameEvent; import org.l2jmobius.gameserver.model.entity.event.TvT; import org.l2jmobius.gameserver.model.entity.event.VIP; import org.l2jmobius.gameserver.model.entity.olympiad.Olympiad; +import org.l2jmobius.gameserver.model.items.Weapon; +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.zone.ZoneId; @@ -132,10 +136,6 @@ 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.templates.creatures.CreatureTemplate; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; -import org.l2jmobius.gameserver.templates.item.Weapon; -import org.l2jmobius.gameserver.templates.item.WeaponType; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Playable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Playable.java index 7310f882cc..5682cfd265 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Playable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Playable.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.knownlist.PlayableKnownList; import org.l2jmobius.gameserver.model.actor.stat.PlayableStat; import org.l2jmobius.gameserver.model.actor.status.PlayableStatus; -import org.l2jmobius.gameserver.templates.creatures.CreatureTemplate; +import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; /** * This class represents all Playable characters in the world.
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java index 15e1a0ca4a..25ad172383 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -39,6 +39,8 @@ import org.l2jmobius.gameserver.model.actor.instance.SiegeSummonInstance; import org.l2jmobius.gameserver.model.actor.knownlist.SummonKnownList; import org.l2jmobius.gameserver.model.actor.stat.SummonStat; import org.l2jmobius.gameserver.model.actor.status.SummonStatus; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.items.Weapon; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; @@ -49,8 +51,6 @@ import org.l2jmobius.gameserver.network.serverpackets.PetStatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; -import org.l2jmobius.gameserver.templates.item.Weapon; public abstract class Summon extends Playable { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/AdventurerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/AdventurerInstance.java index a8779d3e24..d0fc56068a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/AdventurerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/AdventurerInstance.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.actor.instance; import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.network.serverpackets.ExQuestInfo; import org.l2jmobius.gameserver.network.serverpackets.RadarControl; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * @version $Revision: $ $Date: $ diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ArtefactInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ArtefactInstance.java index 65dbd4fa49..a9df3de597 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ArtefactInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ArtefactInstance.java @@ -18,10 +18,10 @@ package org.l2jmobius.gameserver.model.actor.instance; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * This class manages all Castle Siege Artefacts.
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/AuctioneerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/AuctioneerInstance.java index 5f81961ea9..155a1edb86 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/AuctioneerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/AuctioneerInstance.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.datatables.csv.MapRegionTable; import org.l2jmobius.gameserver.instancemanager.AuctionManager; import org.l2jmobius.gameserver.instancemanager.ClanHallManager; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.Auction; import org.l2jmobius.gameserver.model.entity.Auction.Bidder; @@ -34,7 +35,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class AuctioneerInstance extends FolkInstance { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BabyPetInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BabyPetInstance.java index 0841948aac..1ed736bcde 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BabyPetInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BabyPetInstance.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; /** * @version $Revision: 1.15.2.10.2.16 $ $Date: 2005/04/06 16:13:40 $ diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BlacksmithInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BlacksmithInstance.java index 630fc68efe..b7156c66b9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BlacksmithInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BlacksmithInstance.java @@ -16,8 +16,8 @@ */ package org.l2jmobius.gameserver.model.actor.instance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.multisell.Multisell; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * @author zabbix Lets drink to code! diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BoatInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BoatInstance.java index ef96a61da6..f91ca1909f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BoatInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BoatInstance.java @@ -32,6 +32,8 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.knownlist.BoatKnownList; +import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; +import org.l2jmobius.gameserver.model.items.Weapon; import org.l2jmobius.gameserver.network.clientpackets.Say2; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -39,8 +41,6 @@ import org.l2jmobius.gameserver.network.serverpackets.OnVehicleCheckLocation; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.VehicleDeparture; import org.l2jmobius.gameserver.network.serverpackets.VehicleInfo; -import org.l2jmobius.gameserver.templates.creatures.CreatureTemplate; -import org.l2jmobius.gameserver.templates.item.Weapon; /** * @author Maktakien diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BoxInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BoxInstance.java index 0bb3c5f4e4..e310008c11 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BoxInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BoxInstance.java @@ -25,9 +25,9 @@ import java.util.List; import java.util.Set; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * This class implements a Box instance which is used like a warehouse but
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CabaleBufferInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CabaleBufferInstance.java index 6833b20b67..a657092b84 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CabaleBufferInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CabaleBufferInstance.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSigns; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -31,7 +32,6 @@ import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * @author Layane diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleBlacksmithInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleBlacksmithInstance.java index 4d2a99186e..18b2cffe46 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleBlacksmithInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleBlacksmithInstance.java @@ -17,12 +17,12 @@ package org.l2jmobius.gameserver.model.actor.instance; import org.l2jmobius.gameserver.ai.CtrlIntention; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * @author eX1steam diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleChamberlainInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleChamberlainInstance.java index 5ba13eafc9..f70828b315 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleChamberlainInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleChamberlainInstance.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.PlayerInventory; import org.l2jmobius.gameserver.model.StoreTradeList; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSigns; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -40,7 +41,6 @@ import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleMagicianInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleMagicianInstance.java index 9571d7ac41..01aa8f8975 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleMagicianInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleMagicianInstance.java @@ -17,11 +17,11 @@ package org.l2jmobius.gameserver.model.actor.instance; import org.l2jmobius.gameserver.model.Effect.EffectType; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSigns; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * The Class CastleMagicianInstance. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleTeleporterInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleTeleporterInstance.java index 96594a7ad4..4be2fadae4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleTeleporterInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleTeleporterInstance.java @@ -20,8 +20,8 @@ import java.util.StringTokenizer; import java.util.logging.Logger; import org.l2jmobius.commons.concurrent.ThreadPool; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * The Class CastleTeleporterInstance. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleWarehouseInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleWarehouseInstance.java index dbc8e709fc..97971a38d9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleWarehouseInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleWarehouseInstance.java @@ -16,13 +16,13 @@ */ package org.l2jmobius.gameserver.model.actor.instance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.WareHouseDepositList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * The Class CastleWarehouseInstance. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ChestInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ChestInstance.java index 8243960968..9d96ce7413 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ChestInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ChestInstance.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.datatables.sql.NpcTable; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * This class manages all chest. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java index c97f74cd5f..e68653e0a2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.TeleportLocation; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -40,7 +41,6 @@ import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; import org.l2jmobius.gameserver.network.serverpackets.WareHouseDepositList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * The Class PledgeHallManagerInstance. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallSiegeInfInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallSiegeInfInstance.java index b1c76f163d..a7bda80dae 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallSiegeInfInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallSiegeInfInstance.java @@ -20,6 +20,7 @@ import java.text.SimpleDateFormat; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.ClanHallManager; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.entity.ClanHall; @@ -29,7 +30,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * @author MHard L2EmuRT diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClassMasterInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClassMasterInstance.java index 3ab97db8f5..a9ae69a57b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClassMasterInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClassMasterInstance.java @@ -20,6 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.datatables.sql.CharTemplateTable; import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.base.ClassLevel; import org.l2jmobius.gameserver.model.base.PlayerClass; @@ -29,7 +30,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class ClassMasterInstance extends FolkInstance { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CommanderInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CommanderInstance.java index fe6beea481..9a05b4e723 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CommanderInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CommanderInstance.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.knownlist.CommanderKnownList; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; /** * @author programmos diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ControlTowerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ControlTowerInstance.java index 261b619b3b..ae6c61e5cd 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ControlTowerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ControlTowerInstance.java @@ -22,12 +22,12 @@ import java.util.List; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class ControlTowerInstance extends NpcInstance { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ControllableMobInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ControllableMobInstance.java index 862bfb11b7..8f302576c4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ControllableMobInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ControllableMobInstance.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.ControllableMobAI; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; /** * @author littlecrow diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CustomNpcInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CustomNpcInstance.java index 0d7a26cf6f..1b3843ce81 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CustomNpcInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CustomNpcInstance.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.CustomNpcInstanceManager; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.base.Race; -import org.l2jmobius.gameserver.templates.item.WeaponType; +import org.l2jmobius.gameserver.model.items.type.WeaponType; /** * This class manages Npc Polymorph into player instances, they look like regular players. This effect will show up on all clients. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DecoInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DecoInstance.java index 2bd926554b..e37f1eb7bc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DecoInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DecoInstance.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.instance; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; public class DecoInstance extends NpcInstance { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java index d0cd39d65a..87a57c6c61 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java @@ -37,11 +37,13 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.knownlist.DoorKnownList; import org.l2jmobius.gameserver.model.actor.stat.DoorStat; import org.l2jmobius.gameserver.model.actor.status.DoorStatus; +import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.entity.siege.Castle; import org.l2jmobius.gameserver.model.entity.siege.Fort; import org.l2jmobius.gameserver.model.entity.siege.clanhalls.DevastatedCastle; +import org.l2jmobius.gameserver.model.items.Weapon; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; @@ -50,8 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; -import org.l2jmobius.gameserver.templates.creatures.CreatureTemplate; -import org.l2jmobius.gameserver.templates.item.Weapon; public class DoorInstance extends Creature { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoormanInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoormanInstance.java index 9f1a543be9..cec9a66689 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoormanInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoormanInstance.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.datatables.sql.ClanTable; import org.l2jmobius.gameserver.instancemanager.ClanHallManager; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -31,7 +32,6 @@ import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.Ride; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class DoormanInstance extends FolkInstance { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/EffectPointInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/EffectPointInstance.java index 694ba0a0fc..3b6d73ce6d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/EffectPointInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/EffectPointInstance.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.actor.instance; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class EffectPointInstance extends NpcInstance { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FeedableBeastInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FeedableBeastInstance.java index 8d9913eb12..bf78f7ee84 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FeedableBeastInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FeedableBeastInstance.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; // This class is here mostly for convinience and for avoidance of hardcoded IDs. // It refers to Beast (mobs) that can be attacked but can also be fed. For example, the Beast Farm's Alpen Buffalo. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FestivalGuideInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FestivalGuideInstance.java index 7ae0988007..99206f5b7a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FestivalGuideInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FestivalGuideInstance.java @@ -22,13 +22,13 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSigns; import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSignsFestival; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * Festival of Darkness Guide (Seven Signs). diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FestivalMonsterInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FestivalMonsterInstance.java index ae365c68cd..4e43fefb5c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FestivalMonsterInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FestivalMonsterInstance.java @@ -18,9 +18,9 @@ package org.l2jmobius.gameserver.model.actor.instance; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSignsFestival; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * FestivalMonsterInstance This class manages all attackable festival NPCs, spawned during the Festival of Darkness. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java index c7d3c81277..1b232575c4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.FishingChampionshipManager; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.StoreTradeList; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.AquireSkillList; @@ -33,7 +34,6 @@ import org.l2jmobius.gameserver.network.serverpackets.BuyList; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.SellList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class FishermanInstance extends FolkInstance { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FolkInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FolkInstance.java index 4fd3d8e4f7..9edaa738ee 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FolkInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FolkInstance.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.datatables.sql.SkillTreeTable; import org.l2jmobius.gameserver.model.EnchantSkillLearn; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.SkillLearn; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -29,7 +30,6 @@ import org.l2jmobius.gameserver.network.serverpackets.AquireSkillList; import org.l2jmobius.gameserver.network.serverpackets.ExEnchantSkillList; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * The Class FolkInstance. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortManagerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortManagerInstance.java index 0c30343d21..070aead3e2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortManagerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortManagerInstance.java @@ -19,12 +19,12 @@ package org.l2jmobius.gameserver.model.actor.instance; import java.util.StringTokenizer; import org.l2jmobius.gameserver.ai.CtrlIntention; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.WareHouseDepositList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * Fortress Foreman implementation used for: Area Teleports, Support Magic, Clan Warehouse, Exp Loss Reduction diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortMerchantInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortMerchantInstance.java index ecfd3989c9..cd1509a9a7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortMerchantInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortMerchantInstance.java @@ -19,11 +19,11 @@ package org.l2jmobius.gameserver.model.actor.instance; import java.util.StringTokenizer; import org.l2jmobius.gameserver.ai.CtrlIntention; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * @author programmos, scoria dev diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortSiegeGuardInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortSiegeGuardInstance.java index ceb5dcd8a9..544332dde5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortSiegeGuardInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortSiegeGuardInstance.java @@ -25,11 +25,11 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.knownlist.FortSiegeGuardKnownList; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class FortSiegeGuardInstance extends Attackable { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortWyvernManagerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortWyvernManagerInstance.java index d3302cdf3b..1e09157d67 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortWyvernManagerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortWyvernManagerInstance.java @@ -18,10 +18,10 @@ package org.l2jmobius.gameserver.model.actor.instance; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.datatables.SkillTable; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.Ride; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * @author Scoria, Qwerty diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyMobInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyMobInstance.java index f3d1cfcfe0..2866aa9a3f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyMobInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyMobInstance.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.actor.instance; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.knownlist.FriendlyMobKnownList; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; /** * This class represents Friendly Mobs lying over the world. These friendly mobs should only attack players with karma > 0 and it is always aggro, since it just attacks players with karma diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/GourdInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/GourdInstance.java index 3f2023ffc1..ca5a73e3e3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/GourdInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/GourdInstance.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.actor.instance; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class GourdInstance extends MonsterInstance { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/GrandBossInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/GrandBossInstance.java index 36beb4cc60..74aa1eaddb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/GrandBossInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/GrandBossInstance.java @@ -23,10 +23,10 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.RaidBossPointsManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * This class manages all Grand Bosses. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java index bf98b8fd9a..53eec2bcf0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java @@ -26,11 +26,11 @@ import org.l2jmobius.gameserver.model.WorldRegion; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.knownlist.GuardKnownList; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * This class manages all Guards in the world. It inherits all methods from Attackable and adds some more such as tracking PK and aggressive MonsterInstance.
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/GuardNoHTMLInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/GuardNoHTMLInstance.java index 3b645575e6..4c82aa92fb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/GuardNoHTMLInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/GuardNoHTMLInstance.java @@ -26,10 +26,10 @@ import org.l2jmobius.gameserver.model.WorldRegion; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.knownlist.GuardNoHTMLKnownList; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * This class manages all Guards in the world. It inherits all methods from Attackable and adds some more such as tracking PK and aggressive MonsterInstance.
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/HennaInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/HennaInstance.java index afb5436f18..8969ad1d1e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/HennaInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/HennaInstance.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.gameserver.templates.item.Henna; +import org.l2jmobius.gameserver.model.items.Henna; /** * This class represents a Non-Player-Creature in the world. it can be a monster or a friendly creature. it also uses a template to fetch some static values. the templates are hardcoded in the client, so we can rely on them. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ItemInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ItemInstance.java index c64faa1743..d9818fed15 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ItemInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ItemInstance.java @@ -38,16 +38,16 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.knownlist.NullKnownList; +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.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.templates.item.Armor; -import org.l2jmobius.gameserver.templates.item.EtcItem; -import org.l2jmobius.gameserver.templates.item.Item; -import org.l2jmobius.gameserver.templates.item.Weapon; import org.l2jmobius.gameserver.util.IllegalPlayerAction; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ManorManagerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ManorManagerInstance.java index 525d064acc..8ac5886899 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ManorManagerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ManorManagerInstance.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.SeedProduction; import org.l2jmobius.gameserver.model.StoreTradeList; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.BuyList; @@ -38,7 +39,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowSellCropList; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class ManorManagerInstance extends MerchantInstance { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MercManagerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MercManagerInstance.java index 25da127287..596f1b4c64 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MercManagerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MercManagerInstance.java @@ -21,13 +21,13 @@ import java.util.StringTokenizer; import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StoreTradeList; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.BuyList; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class MercManagerInstance extends FolkInstance { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MerchantInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MerchantInstance.java index 16aca3fd56..f9c14a0349 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MerchantInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MerchantInstance.java @@ -21,6 +21,7 @@ import java.util.StringTokenizer; import org.l2jmobius.Config; import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.model.StoreTradeList; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.multisell.Multisell; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -31,7 +32,6 @@ import org.l2jmobius.gameserver.network.serverpackets.Ride; import org.l2jmobius.gameserver.network.serverpackets.SellList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.WearList; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class MerchantInstance extends FolkInstance { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MinionInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MinionInstance.java index 58e5671dd2..78bd8d877b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MinionInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MinionInstance.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldRegion; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; /** * This class manages all Minions. In a group mob, there are one master called RaidBoss and several slaves called Minions. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java index 687f5b1cfd..9b24aa3bf3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java @@ -26,9 +26,9 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.knownlist.MonsterKnownList; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; import org.l2jmobius.gameserver.util.MinionList; /** 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 30867840d2..d29c9e6b82 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 @@ -50,6 +50,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.knownlist.NpcKnownList; import org.l2jmobius.gameserver.model.actor.stat.NpcStat; import org.l2jmobius.gameserver.model.actor.status.NpcStatus; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.event.CTF; import org.l2jmobius.gameserver.model.entity.event.DM; @@ -62,6 +63,10 @@ import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSigns; import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSignsFestival; import org.l2jmobius.gameserver.model.entity.siege.Castle; import org.l2jmobius.gameserver.model.entity.siege.Fort; +import org.l2jmobius.gameserver.model.holders.HelperBuffHolder; +import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.multisell.Multisell; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; @@ -88,11 +93,6 @@ 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; -import org.l2jmobius.gameserver.templates.HelperBuff; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; -import org.l2jmobius.gameserver.templates.item.Item; -import org.l2jmobius.gameserver.templates.item.Weapon; -import org.l2jmobius.gameserver.templates.item.WeaponType; /** * This class represents a Non-Player-Creature in the world. It can be a monster or a friendly creature. It also uses a template to fetch some static values. The templates are hardcoded in the client, so we can rely on them.
@@ -2353,7 +2353,7 @@ public class NpcInstance extends Creature Skill skill = null; // Go through the Helper Buff list define in sql table helper_buff_list and cast skill - for (HelperBuff helperBuffItem : HelperBuffTable.getInstance().getHelperBuffTable()) + for (HelperBuffHolder helperBuffItem : HelperBuffTable.getInstance().getHelperBuffTable()) { if (helperBuffItem.isMagicClassBuff() == player.isMageClass()) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcWalkerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcWalkerInstance.java index 578a6e585b..b2aed6c43b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcWalkerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcWalkerInstance.java @@ -21,8 +21,8 @@ import java.util.Map; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.NpcWalkerAI; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * This class manages some npcs can walk in the city.
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ObservationInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ObservationInstance.java index ec07319b16..84feeb32cc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ObservationInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ObservationInstance.java @@ -19,11 +19,11 @@ package org.l2jmobius.gameserver.model.actor.instance; import java.util.StringTokenizer; import org.l2jmobius.gameserver.instancemanager.SiegeManager; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * The Class L2ObservationInstance. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/OlympiadManagerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/OlympiadManagerInstance.java index d40417ea9d..fce1db1b4d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/OlympiadManagerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/OlympiadManagerInstance.java @@ -21,6 +21,7 @@ import java.util.Map; import java.util.logging.Logger; import org.l2jmobius.Config; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.olympiad.Olympiad; import org.l2jmobius.gameserver.model.multisell.Multisell; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -28,7 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ExHeroList; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * Olympiad NPCs Instance diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PenaltyMonsterInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PenaltyMonsterInstance.java index 58cdf67895..85bb4ada21 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PenaltyMonsterInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PenaltyMonsterInstance.java @@ -20,10 +20,10 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.datatables.sql.SpawnTable; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.network.clientpackets.Say2; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class PenaltyMonsterInstance extends MonsterInstance { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java index 8dfb753517..6c54413cb5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java @@ -40,7 +40,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.stat.PetStat; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.olympiad.Olympiad; +import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.items.Weapon; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -53,9 +56,6 @@ import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.StopMove; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; -import org.l2jmobius.gameserver.templates.item.Item; -import org.l2jmobius.gameserver.templates.item.Weapon; public class PetInstance extends Summon { 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 429880e3a2..4e327eb621 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 @@ -121,6 +121,7 @@ import org.l2jmobius.gameserver.model.actor.appearance.PlayerAppearance; import org.l2jmobius.gameserver.model.actor.knownlist.PlayerKnownList; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.actor.status.PlayerStatus; +import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.base.ClassLevel; import org.l2jmobius.gameserver.model.base.PlayerClass; @@ -145,6 +146,13 @@ import org.l2jmobius.gameserver.model.entity.siege.Siege; import org.l2jmobius.gameserver.model.entity.siege.clanhalls.DevastatedCastle; import org.l2jmobius.gameserver.model.holders.PlayerStatsHolder; import org.l2jmobius.gameserver.model.holders.TimestampHolder; +import org.l2jmobius.gameserver.model.items.Armor; +import org.l2jmobius.gameserver.model.items.Henna; +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.EtcItemType; +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; @@ -215,14 +223,6 @@ 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.templates.creatures.PlayerTemplate; -import org.l2jmobius.gameserver.templates.item.Armor; -import org.l2jmobius.gameserver.templates.item.ArmorType; -import org.l2jmobius.gameserver.templates.item.EtcItemType; -import org.l2jmobius.gameserver.templates.item.Henna; -import org.l2jmobius.gameserver.templates.item.Item; -import org.l2jmobius.gameserver.templates.item.Weapon; -import org.l2jmobius.gameserver.templates.item.WeaponType; import org.l2jmobius.gameserver.thread.LoginServerThread; import org.l2jmobius.gameserver.thread.daemons.ItemsAutoDestroy; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ProtectorInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ProtectorInstance.java index 3876653eb0..42a4145947 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ProtectorInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ProtectorInstance.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * @author Ederik diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/RaceManagerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/RaceManagerInstance.java index 49b4f6727c..ae492f2666 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/RaceManagerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/RaceManagerInstance.java @@ -22,6 +22,7 @@ import java.util.List; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.model.actor.knownlist.RaceManagerKnownList; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.MonsterRace; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.network.serverpackets.MonRaceInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; import org.l2jmobius.gameserver.util.Broadcast; public class RaceManagerInstance extends NpcInstance diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/RaidBossInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/RaidBossInstance.java index 177f810abc..355ca37478 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/RaidBossInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/RaidBossInstance.java @@ -24,10 +24,10 @@ import org.l2jmobius.gameserver.instancemanager.RaidBossPointsManager; import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * This class manages all RaidBoss. In a group mob, there are one master called RaidBoss and several slaves called Minions. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/RaidBossManagerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/RaidBossManagerInstance.java index cb5d6c208d..8252bcb382 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/RaidBossManagerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/RaidBossManagerInstance.java @@ -17,11 +17,11 @@ package org.l2jmobius.gameserver.model.actor.instance; import org.l2jmobius.gameserver.ai.CtrlIntention; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * @author xAddytzu moded by Bobi diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/RiftInvaderInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/RiftInvaderInstance.java index 9f19666e91..a7728381dc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/RiftInvaderInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/RiftInvaderInstance.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; public class RiftInvaderInstance extends MonsterInstance { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index ecc36837a9..70b9b6e47d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.datatables.BufferTable; import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; import org.l2jmobius.gameserver.util.Util; public class SchemeBufferInstance extends FolkInstance diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherMonsterInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherMonsterInstance.java index 4981c8011c..cec86570e5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherMonsterInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherMonsterInstance.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.instancemanager.FourSepulchersManager; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * @author sandman diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpcInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpcInstance.java index 5c4e1c34ca..3460ed800a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpcInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpcInstance.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.datatables.csv.DoorTable; import org.l2jmobius.gameserver.instancemanager.FourSepulchersManager; import org.l2jmobius.gameserver.model.World; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; @@ -35,7 +36,6 @@ import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java index 95826d3974..d6ad7a2c98 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java @@ -20,12 +20,12 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.siege.Siege; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class SiegeFlagInstance extends NpcInstance { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeGuardInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeGuardInstance.java index 43962fa34d..b112afa849 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeGuardInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeGuardInstance.java @@ -24,13 +24,13 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.knownlist.SiegeGuardKnownList; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.siege.clanhalls.DevastatedCastle; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * This class represents all guards in the world. It inherits all methods from Attackable and adds some more such as tracking PK's or custom interactions. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeNpcInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeNpcInstance.java index 19541adacb..98947d1bda 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeNpcInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeNpcInstance.java @@ -17,11 +17,11 @@ package org.l2jmobius.gameserver.model.actor.instance; import org.l2jmobius.gameserver.ai.CtrlIntention; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class SiegeNpcInstance extends FolkInstance { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeSummonInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeSummonInstance.java index fb5b746dea..a25d3a2ea7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeSummonInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeSummonInstance.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.actor.instance; import org.l2jmobius.gameserver.model.Skill; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.zone.ZoneId; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class SiegeSummonInstance extends SummonInstance { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriestInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriestInstance.java index e92ae8c973..591b08e988 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriestInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriestInstance.java @@ -21,6 +21,7 @@ import java.util.StringTokenizer; import org.l2jmobius.Config; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.datatables.sql.ClanTable; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSigns; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -28,7 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * Dawn/Dusk Seven Signs Priest Instance diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SummonInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SummonInstance.java index 7f2723afb1..c8baf33ee9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SummonInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SummonInstance.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.olympiad.Olympiad; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SetSummonRemainTime; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class SummonInstance extends Summon { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SymbolMakerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SymbolMakerInstance.java index dd6d6652c2..195d19d9e7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SymbolMakerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SymbolMakerInstance.java @@ -18,9 +18,9 @@ package org.l2jmobius.gameserver.model.actor.instance; import org.l2jmobius.gameserver.datatables.sql.HennaTreeTable; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.serverpackets.HennaEquipList; import org.l2jmobius.gameserver.network.serverpackets.ItemList; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class SymbolMakerInstance extends FolkInstance { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeastInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeastInstance.java index 6f3fd478a9..c3e7a47ca5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeastInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeastInstance.java @@ -28,9 +28,9 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.StopMove; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * While a tamed beast behaves a lot like a pet (ingame) and does have an owner, in all other aspects, it acts like a mob. In addition, it can be fed in order to increase its duration.
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java index aef2d35233..99b02a66ac 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java @@ -25,13 +25,13 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.TownManager; import org.l2jmobius.gameserver.model.TeleportLocation; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.olympiad.Olympiad; import org.l2jmobius.gameserver.model.zone.type.BossZone; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * The Class TeleporterInstance. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TownPetInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TownPetInstance.java index be5eeebe2d..c86bb5eef3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TownPetInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TownPetInstance.java @@ -20,10 +20,10 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * @author Kerberos diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TrainerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TrainerInstance.java index 9edf30aa3d..afa82882aa 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TrainerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TrainerInstance.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; public class TrainerInstance extends FolkInstance { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index 8e6d8b0ee2..ca34f089ab 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.PledgeSkillLearn; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.base.ClassType; import org.l2jmobius.gameserver.model.base.PlayerClass; @@ -47,7 +48,6 @@ import org.l2jmobius.gameserver.network.serverpackets.AquireSkillList; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; import org.l2jmobius.gameserver.util.Util; public class VillageMasterInstance extends FolkInstance diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WarehouseInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WarehouseInstance.java index 6baae3a6a3..f055bc3d0d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WarehouseInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WarehouseInstance.java @@ -20,6 +20,7 @@ import java.util.Map; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.PlayerFreight; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -27,7 +28,6 @@ import org.l2jmobius.gameserver.network.serverpackets.EnchantResult; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseDepositList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class WarehouseInstance extends FolkInstance { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WeddingManagerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WeddingManagerInstance.java index 3de6ed44f8..686d7a2a90 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WeddingManagerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WeddingManagerInstance.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.CoupleManager; import org.l2jmobius.gameserver.model.Inventory; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.World; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.Announcements; import org.l2jmobius.gameserver.model.entity.Wedding; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -30,7 +31,6 @@ import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class WeddingManagerInstance extends NpcInstance { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WyvernManagerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WyvernManagerInstance.java index 3b90d6f359..4a6336df96 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WyvernManagerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WyvernManagerInstance.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor.instance; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.instancemanager.ClanHallManager; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -28,7 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.Ride; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class WyvernManagerInstance extends CastleChamberlainInstance { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/XmassTreeInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/XmassTreeInstance.java index 7648d57937..7b8af39fb4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/XmassTreeInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/XmassTreeInstance.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * @author Drunkard Zabb0x Lets drink2code! diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/creatures/CreatureTemplate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java similarity index 98% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/creatures/CreatureTemplate.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 6136b85601..a8698f6feb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/creatures/CreatureTemplate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.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.templates.creatures; +package org.l2jmobius.gameserver.model.actor.templates; import org.l2jmobius.gameserver.model.StatsSet; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/creatures/NpcTemplate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java similarity index 99% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/creatures/NpcTemplate.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 7909d21582..88d4e9999d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/creatures/NpcTemplate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.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.templates.creatures; +package org.l2jmobius.gameserver.model.actor.templates; import java.util.ArrayList; import java.util.HashMap; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/creatures/PlayerTemplate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java similarity index 96% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/creatures/PlayerTemplate.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 93a07fd553..ce95f01e25 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/creatures/PlayerTemplate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.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.templates.creatures; +package org.l2jmobius.gameserver.model.actor.templates; import java.util.ArrayList; import java.util.List; @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.base.Race; -import org.l2jmobius.gameserver.templates.item.Item; +import org.l2jmobius.gameserver.model.items.Item; /** * @author mkizub diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/Hero.java index f0f27c7395..df16838871 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/Hero.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/Hero.java @@ -34,12 +34,12 @@ import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.olympiad.Olympiad; +import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowInfoUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; -import org.l2jmobius.gameserver.templates.item.Item; /** * @author godson diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/MonsterRace.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/MonsterRace.java index 96fd9fac19..0b06d95230 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/MonsterRace.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/MonsterRace.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.datatables.sql.NpcTable; import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; public class MonsterRace { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/CTF.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/CTF.java index 5ddcd60eaf..6045094772 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/CTF.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/CTF.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.Announcements; import org.l2jmobius.gameserver.model.entity.event.manager.EventTask; import org.l2jmobius.gameserver.model.entity.olympiad.Olympiad; @@ -56,7 +57,6 @@ import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.RadarControl; import org.l2jmobius.gameserver.network.serverpackets.Ride; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class CTF implements EventTask { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/DM.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/DM.java index 47cb436cd7..7a6fdfc48f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/DM.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/DM.java @@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.World; 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.templates.NpcTemplate; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.entity.Announcements; import org.l2jmobius.gameserver.model.entity.event.manager.EventTask; @@ -50,7 +51,6 @@ import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.Ride; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class DM implements EventTask { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/GameEvent.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/GameEvent.java index 199bdd7e04..70f8b1d4d5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/GameEvent.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/GameEvent.java @@ -30,12 +30,12 @@ import org.l2jmobius.gameserver.datatables.sql.NpcTable; import org.l2jmobius.gameserver.datatables.sql.SpawnTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.network.clientpackets.Say2; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; import org.l2jmobius.gameserver.util.EventData; public class GameEvent diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/TvT.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/TvT.java index 675ce269b9..f0fea96a25 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/TvT.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/TvT.java @@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.World; 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.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.Announcements; import org.l2jmobius.gameserver.model.entity.event.manager.EventTask; import org.l2jmobius.gameserver.model.entity.olympiad.Olympiad; @@ -49,7 +50,6 @@ import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.Ride; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class TvT implements EventTask { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/VIP.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/VIP.java index a6d33369ad..9edf5a2ae0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/VIP.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/VIP.java @@ -31,16 +31,16 @@ import org.l2jmobius.gameserver.datatables.sql.SpawnTable; import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.model.PlayerInventory; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.base.Race; import org.l2jmobius.gameserver.model.entity.Announcements; +import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; -import org.l2jmobius.gameserver.templates.item.Item; public class VIP { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/sevensigns/SevenSignsFestival.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/sevensigns/SevenSignsFestival.java index 979c7ea918..05157018a4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/sevensigns/SevenSignsFestival.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/sevensigns/SevenSignsFestival.java @@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FestivalMonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.model.spawn.SpawnListener; @@ -53,7 +54,6 @@ import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowInfoUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Siege.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Siege.java index 2af39be2b0..c582ad4da8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Siege.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Siege.java @@ -46,6 +46,7 @@ import org.l2jmobius.gameserver.model.actor.instance.ArtefactInstance; import org.l2jmobius.gameserver.model.actor.instance.ControlTowerInstance; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.Announcements; import org.l2jmobius.gameserver.model.spawn.Spawn; @@ -55,7 +56,6 @@ import org.l2jmobius.gameserver.network.serverpackets.RelationChanged; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * The Class Siege. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/BanditStrongholdSiege.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/BanditStrongholdSiege.java index afda1ced1e..432a6f81ac 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/BanditStrongholdSiege.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/BanditStrongholdSiege.java @@ -36,13 +36,13 @@ import org.l2jmobius.gameserver.model.actor.instance.DecoInstance; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; 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.clan.Clan; import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.entity.siege.ClanHallSiege; import org.l2jmobius.gameserver.model.zone.type.ClanHallZone; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.taskmanager.ExclusiveTask; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * @author MHard diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/DevastatedCastle.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/DevastatedCastle.java index c9bdb817f1..aa87ec2b19 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/DevastatedCastle.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/DevastatedCastle.java @@ -34,11 +34,11 @@ import org.l2jmobius.gameserver.datatables.sql.NpcTable; import org.l2jmobius.gameserver.instancemanager.ClanHallManager; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.Announcements; import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.spawn.Spawn; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class DevastatedCastle { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/FortressOfResistance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/FortressOfResistance.java index e252ef1b09..91a126804b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/FortressOfResistance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/FortressOfResistance.java @@ -33,10 +33,10 @@ import org.l2jmobius.gameserver.datatables.sql.NpcTable; import org.l2jmobius.gameserver.instancemanager.ClanHallManager; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.Announcements; import org.l2jmobius.gameserver.model.spawn.Spawn; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class FortressOfResistance { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/WildBeastFarmSiege.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/WildBeastFarmSiege.java index ab0f9c1e6a..4314850ba3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/WildBeastFarmSiege.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/WildBeastFarmSiege.java @@ -36,13 +36,13 @@ import org.l2jmobius.gameserver.model.actor.instance.DecoInstance; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; 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.clan.Clan; import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.entity.siege.ClanHallSiege; import org.l2jmobius.gameserver.model.zone.type.ClanHallZone; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.taskmanager.ExclusiveTask; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class WildBeastFarmSiege extends ClanHallSiege { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/HelperBuff.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/holders/HelperBuffHolder.java similarity index 96% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/HelperBuff.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/holders/HelperBuffHolder.java index c3e966c69d..059e64d058 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/HelperBuff.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/holders/HelperBuffHolder.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.templates; +package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.model.StatsSet; /** * This class represents a Newbie Helper Buff Author: Ayor */ -public class HelperBuff +public class HelperBuffHolder { /** Min level that the player must achieve to obtain this buff from Newbie Helper */ private int _lowerLevel; @@ -46,7 +46,7 @@ public class HelperBuff *
* @param set */ - public HelperBuff(StatsSet set) + public HelperBuffHolder(StatsSet set) { _lowerLevel = set.getInt("lowerLevel"); _upperLevel = set.getInt("upperLevel"); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/item/Armor.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.java similarity index 97% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/item/Armor.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.java index d9ab77ced4..ff7b9c5418 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/item/Armor.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.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.templates.item; +package org.l2jmobius.gameserver.model.items; import java.util.ArrayList; import java.util.List; @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.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; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/item/EtcItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/EtcItem.java similarity index 94% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/item/EtcItem.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/EtcItem.java index a7a12f629a..a06773c608 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/item/EtcItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/EtcItem.java @@ -14,9 +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.templates.item; +package org.l2jmobius.gameserver.model.items; import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.items.type.EtcItemType; /** * This class is dedicated to the management of EtcItem. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/item/Henna.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Henna.java similarity index 97% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/item/Henna.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Henna.java index 37671c6417..b6ad57137c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/item/Henna.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Henna.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.templates.item; +package org.l2jmobius.gameserver.model.items; import org.l2jmobius.gameserver.model.StatsSet; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/item/Item.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java similarity index 99% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/item/Item.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java index 4c3d62ddc3..f821375322 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/item/Item.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Item.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.templates.item; +package org.l2jmobius.gameserver.model.items; import java.util.ArrayList; import java.util.List; @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.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; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/item/Weapon.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java similarity index 99% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/item/Weapon.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java index 693b17a8f9..5aa093aad5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/item/Weapon.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.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.templates.item; +package org.l2jmobius.gameserver.model.items; import java.io.IOException; import java.util.ArrayList; @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +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; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/item/ArmorType.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java similarity index 96% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/item/ArmorType.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java index d024615198..0f66435c6a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/item/ArmorType.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/type/ArmorType.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.templates.item; +package org.l2jmobius.gameserver.model.items.type; /** * Description of Armor Type diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/item/EtcItemType.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java similarity index 96% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/item/EtcItemType.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java index a0e0153142..afcc2c2430 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/item/EtcItemType.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.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.templates.item; +package org.l2jmobius.gameserver.model.items.type; /** * Description of EtcItem Type diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/item/ItemType.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/type/ItemType.java similarity index 90% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/item/ItemType.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/type/ItemType.java index fb47a6e104..2507826373 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/item/ItemType.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/type/ItemType.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -package org.l2jmobius.gameserver.templates.item; +package org.l2jmobius.gameserver.model.items.type; /** * @author programmos diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/item/WeaponType.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java similarity index 97% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/item/WeaponType.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java index 5eee8be232..9bd7669501 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/templates/item/WeaponType.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/type/WeaponType.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.templates.item; +package org.l2jmobius.gameserver.model.items.type; /** * @author mkizub
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/multisell/Multisell.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/multisell/Multisell.java index 9fde1ebdae..2fcbf22dfa 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/multisell/Multisell.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/multisell/Multisell.java @@ -30,10 +30,10 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.Armor; +import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.items.Weapon; import org.l2jmobius.gameserver.network.serverpackets.MultiSellList; -import org.l2jmobius.gameserver.templates.item.Armor; -import org.l2jmobius.gameserver.templates.item.Item; -import org.l2jmobius.gameserver.templates.item.Weapon; /** * Multisell list manager diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java index 0e99834847..4b287a3480 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -44,6 +44,7 @@ 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.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -52,7 +53,6 @@ import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.scripting.ManagedScript; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * @author Luis Arias diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestSpawn.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestSpawn.java index 37b28eaabb..4ea32748c1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestSpawn.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestSpawn.java @@ -23,8 +23,8 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.datatables.sql.NpcTable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.spawn.Spawn; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * @author programmos diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/AutoSpawn.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/AutoSpawn.java index add2da42a8..932aebfb29 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/AutoSpawn.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/AutoSpawn.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.datatables.sql.SpawnTable; import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.Announcements; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * Auto Spawn Handler Allows spawning of a NPC object based on a timer. (From the official idea used for the Merchant and Blacksmith of Mammon) General Usage: - Call registerSpawn() with the parameters listed below. int npcId int[][] spawnPoints or specify NULL to add points later. int initialDelay diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/GroupSpawn.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/GroupSpawn.java index f79c37d198..6c79c7632d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/GroupSpawn.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/GroupSpawn.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.datatables.sql.TerritoryTable; import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; /** * @author littlecrow A special spawn implementation to spawn controllable mob diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/Spawn.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/Spawn.java index 09f99d03db..8bce5eb455 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/Spawn.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/Spawn.java @@ -27,9 +27,9 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.taskmanager.RespawnTaskManager; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index ea93285815..b40610f696 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -36,14 +36,14 @@ import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; +import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectInfo; -import org.l2jmobius.gameserver.templates.creatures.PlayerTemplate; -import org.l2jmobius.gameserver.templates.item.Item; import org.l2jmobius.gameserver.util.Util; @SuppressWarnings("unused") diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 310c4f3ebd..e254d2fc46 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -27,6 +27,9 @@ import org.l2jmobius.gameserver.model.PlayerInventory; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.Armor; +import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.items.Weapon; import org.l2jmobius.gameserver.model.multisell.MultiSellEntry; import org.l2jmobius.gameserver.model.multisell.MultiSellIngredient; import org.l2jmobius.gameserver.model.multisell.MultiSellListContainer; @@ -37,9 +40,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowInfoUpdate; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.item.Armor; -import org.l2jmobius.gameserver.templates.item.Item; -import org.l2jmobius.gameserver.templates.item.Weapon; /** * @author programmos diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java index 9d28d6d070..5a6eee77cc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.gameserver.datatables.sql.CharTemplateTable; +import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.network.serverpackets.CharTemplates; -import org.l2jmobius.gameserver.templates.creatures.PlayerTemplate; public class NewCharacter extends GameClientPacket { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index 35fb838495..df3483ea83 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -32,13 +32,13 @@ import org.l2jmobius.gameserver.model.actor.instance.MercManagerInstance; import org.l2jmobius.gameserver.model.actor.instance.MerchantInstance; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.item.Item; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyProcure.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyProcure.java index 0d84caa693..bf21f82be6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyProcure.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyProcure.java @@ -27,12 +27,12 @@ import org.l2jmobius.gameserver.model.Manor; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.ManorManagerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.Item; 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.templates.item.Item; import org.l2jmobius.gameserver.util.Util; @SuppressWarnings("unused") diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 6738bc4c0a..f829f4bdd6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -26,12 +26,12 @@ import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.ManorManagerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.entity.siege.Castle; +import org.l2jmobius.gameserver.model.items.Item; 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.templates.item.Item; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java index ec8acf129a..967d700fb2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java @@ -19,9 +19,9 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExConfirmCancelItem; -import org.l2jmobius.gameserver.templates.item.Item; /** * Format(ch) d diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java index 7e6a391ace..8a6c93dd05 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java @@ -19,9 +19,9 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExConfirmVariationGemstone; -import org.l2jmobius.gameserver.templates.item.Item; /** * Format:(ch) dddd diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java index 7c9dbe8a35..eb9df794c0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExConfirmVariationRefiner; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.item.Item; /** * Fromat(ch) dd diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java index aaa2669155..b6fad2a354 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java @@ -19,9 +19,9 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExConfirmVariationItem; -import org.l2jmobius.gameserver.templates.item.Item; /** * Format:(ch) d diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index d31cbe7ada..2c043e7e1b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -24,13 +24,13 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.Item; 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.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.item.Item; import org.l2jmobius.gameserver.util.IllegalPlayerAction; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 891543d9af..15d0899baf 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -24,13 +24,13 @@ import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance.SkillDat; +import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.items.type.EtcItemType; 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.ItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.item.EtcItemType; -import org.l2jmobius.gameserver.templates.item.Item; import org.l2jmobius.gameserver.util.IllegalPlayerAction; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index ed86ec9564..a8eac2ecc7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -25,14 +25,14 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.Race; +import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EnchantResult; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.item.Item; -import org.l2jmobius.gameserver.templates.item.WeaponType; import org.l2jmobius.gameserver.util.IllegalPlayerAction; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index c2385d00a2..971b4cc54b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -22,11 +22,11 @@ import org.l2jmobius.gameserver.datatables.sql.HennaTreeTable; import org.l2jmobius.gameserver.model.actor.instance.HennaInstance; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.Henna; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.item.Henna; import org.l2jmobius.gameserver.util.Util; public class RequestHennaEquip extends GameClientPacket diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 7a27bc6f65..05dc529056 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.gameserver.datatables.csv.HennaTable; import org.l2jmobius.gameserver.model.actor.instance.HennaInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.Henna; import org.l2jmobius.gameserver.network.serverpackets.HennaItemInfo; -import org.l2jmobius.gameserver.templates.item.Henna; public class RequestHennaItemInfo extends GameClientPacket { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 7648397e69..2b00b72a80 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.instance.BoatInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; -import org.l2jmobius.gameserver.templates.item.WeaponType; import org.l2jmobius.gameserver.thread.TaskPriority; public class RequestMoveToLocationInVehicle extends GameClientPacket diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 8c9f29dde7..68baadd88c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -28,12 +28,12 @@ import org.l2jmobius.gameserver.model.actor.instance.FolkInstance; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.type.EtcItemType; 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.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; -import org.l2jmobius.gameserver.templates.item.EtcItemType; /** * @author -Wooden- diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index c1d56b1563..9149be72da 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -27,12 +27,12 @@ import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.ManorManagerInstance; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.Item; 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.templates.item.Item; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index b78a3cf62f..5569245595 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -21,11 +21,11 @@ import org.l2jmobius.gameserver.datatables.xml.AugmentationData; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationResult; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; -import org.l2jmobius.gameserver.templates.item.Item; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 569aa276af..8278686438 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -19,11 +19,11 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationCancelResult; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.item.Item; /** * Format(ch) d diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index 0e3808eabc..3aad85e493 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -20,10 +20,10 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.item.Item; public class RequestUnEquipItem extends GameClientPacket { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java index dbc3e499e0..d9d7c59ed9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java @@ -31,11 +31,11 @@ import org.l2jmobius.gameserver.model.actor.instance.MercManagerInstance; import org.l2jmobius.gameserver.model.actor.instance.MerchantInstance; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.Item; 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.templates.item.Item; import org.l2jmobius.gameserver.util.Util; public class RequestWearItem extends GameClientPacket diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 2501d63af6..e05af64971 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -26,13 +26,13 @@ import org.l2jmobius.gameserver.model.actor.instance.FolkInstance; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.EnchantResult; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; -import org.l2jmobius.gameserver.templates.item.EtcItemType; public class SendWareHouseDepositList extends GameClientPacket { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 5e9ee6a5d9..2c01b6ac15 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -32,6 +32,9 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; @@ -40,9 +43,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.ShowCalculator; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; -import org.l2jmobius.gameserver.templates.item.Item; -import org.l2jmobius.gameserver.templates.item.Weapon; -import org.l2jmobius.gameserver.templates.item.WeaponType; import org.l2jmobius.gameserver.util.Util; public class UseItem extends GameClientPacket diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index 90e052cbd0..a579bd1bd6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; -import org.l2jmobius.gameserver.templates.item.Item; +import org.l2jmobius.gameserver.model.items.Item; /** * sample 1d 1e 00 00 00 // ?? 5c 4a a0 7c // buy list id 02 00 // item count 04 00 // itemType1 0-weapon/ring/earring/necklace 1-armor/shield 4-item/questitem/adena 00 00 00 00 // objectid 32 04 00 00 // itemid 00 00 00 00 // count 05 00 // itemType2 0-weapon 1-shield/armor 2-ring/earring/necklace diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index f959e27304..a48086730a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.Inventory; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.CubicInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; /** * 0000: 03 32 15 00 00 44 fe 00 00 80 f1 ff ff 00 00 00 .2...D.......... diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharTemplates.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharTemplates.java index 05c7fca190..7a358f941b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharTemplates.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharTemplates.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.templates.creatures.PlayerTemplate; +import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; /** * @version $Revision: 1.3.2.1.2.7 $ $Date: 2005/03/27 15:29:39 $ diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java index 0700f32351..f5c81cfa89 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; -import org.l2jmobius.gameserver.templates.item.Item; +import org.l2jmobius.gameserver.model.items.Item; /** * 5e 01 00 00 00 01 - added ? 02 - modified 7b 86 73 42 object id 08 00 00 00 body slot body slot 0000 ?? underwear 0001 ear 0002 ear 0003 neck 0004 finger (magic ring) 0005 finger (magic ring) 0006 head (l.cap) 0007 r.hand (dagger) 0008 l.hand (arrows) 0009 hands (short gloves) 000a chest (squire diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index 91e3cc6c45..c7de7e0804 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -18,8 +18,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.templates.item.Item; -import org.l2jmobius.gameserver.templates.item.Weapon; +import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.items.Weapon; /** * Sdh(h dddhh [dhhh] d) Sdh ddddd ddddd ddddd ddddd diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoPoly.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoPoly.java index 1c907e8700..f1885fdfae 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoPoly.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoPoly.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.datatables.sql.NpcTable; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; /** * @version $Revision: 1.7.2.4.2.9 $ $Date: 2005/04/11 10:05:54 $ diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 383885a070..d3ed10a47c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.CubicInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; /** * 0000: 04 03 15 00 00 77 ff 00 00 80 f1 ff ff 00 00 00 .....w.......... 0010: 00 2a 89 00 4c 43 00 61 00 6c 00 61 00 64 00 6f .*..LC.a.l.a.d.o 0020: 00 6e 00 00 00 01 00 00 00 00 00 00 00 19 00 00 .n.............. 0030: 00 0d 00 00 00 ee 81 02 00 15 00 00 00 18 00 00 ................ 0040: 00 19 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WearList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WearList.java index cfcc1be6e4..f31d6c1f1c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WearList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WearList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; -import org.l2jmobius.gameserver.templates.item.Item; +import org.l2jmobius.gameserver.model.items.Item; public class WearList extends GameServerPacket { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/script/faenor/FaenorInterface.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/script/faenor/FaenorInterface.java index 40c286649b..ea08839ba5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/script/faenor/FaenorInterface.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/script/faenor/FaenorInterface.java @@ -21,11 +21,11 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.model.DropCategory; import org.l2jmobius.gameserver.model.DropData; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.Announcements; import org.l2jmobius.gameserver.script.DateRange; import org.l2jmobius.gameserver.script.EngineInterface; import org.l2jmobius.gameserver.script.EventDroplist; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * @author Luis Arias diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/Formulas.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/Formulas.java index bbfa2a472a..3e1b092cf4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/Formulas.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/Formulas.java @@ -37,10 +37,16 @@ import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSigns; import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSignsFestival; import org.l2jmobius.gameserver.model.entity.siege.Siege; +import org.l2jmobius.gameserver.model.items.Armor; +import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -49,12 +55,6 @@ import org.l2jmobius.gameserver.skills.conditions.ConditionPlayerState.CheckPlay 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.templates.creatures.NpcTemplate; -import org.l2jmobius.gameserver.templates.creatures.PlayerTemplate; -import org.l2jmobius.gameserver.templates.item.Armor; -import org.l2jmobius.gameserver.templates.item.Item; -import org.l2jmobius.gameserver.templates.item.Weapon; -import org.l2jmobius.gameserver.templates.item.WeaponType; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetBodyPart.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetBodyPart.java index 919aae3839..f9a618d183 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetBodyPart.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetBodyPart.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.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.templates.item.Armor; -import org.l2jmobius.gameserver.templates.item.Item; /** * @author mkizub diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetUsesWeaponKind.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetUsesWeaponKind.java index 8aa46ed48d..a9bec80dca 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetUsesWeaponKind.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionTargetUsesWeaponKind.java @@ -16,8 +16,8 @@ */ package org.l2jmobius.gameserver.skills.conditions; +import org.l2jmobius.gameserver.model.items.Weapon; import org.l2jmobius.gameserver.skills.Env; -import org.l2jmobius.gameserver.templates.item.Weapon; /** * @author mkizub diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionUsingItemType.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionUsingItemType.java index c90dfba4a1..ac67413f6b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/conditions/ConditionUsingItemType.java @@ -19,9 +19,9 @@ package org.l2jmobius.gameserver.skills.conditions; import org.l2jmobius.gameserver.model.Inventory; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.skills.Env; -import org.l2jmobius.gameserver.templates.item.ArmorType; -import org.l2jmobius.gameserver.templates.item.Item; /** * The Class ConditionUsingItemType. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSignetMDam.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSignetMDam.java index cd42a5519d..cf3ec375f7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSignetMDam.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/effects/EffectSignetMDam.java @@ -32,12 +32,12 @@ import org.l2jmobius.gameserver.model.actor.Playable; 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.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; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; /** * @author Shyla diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncEnchant.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncEnchant.java index a9191a8bae..632308d9f9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncEnchant.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/funcs/FuncEnchant.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.skills.funcs; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.skills.Env; import org.l2jmobius.gameserver.skills.Stats; -import org.l2jmobius.gameserver.templates.item.Item; -import org.l2jmobius.gameserver.templates.item.WeaponType; public class FuncEnchant extends Func { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillChargeDmg.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillChargeDmg.java index 473b333286..96a2725cee 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillChargeDmg.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillChargeDmg.java @@ -23,13 +23,13 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.items.type.WeaponType; 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; -import org.l2jmobius.gameserver.templates.item.WeaponType; public class SkillChargeDmg 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/skills/handlers/SkillSignet.java index 60a60b117e..35bc2453ae 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillSignet.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillSignet.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.WorldObject; 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.templates.creatures.NpcTemplate; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; public class SkillSignet extends Skill { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillSummon.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillSummon.java index 5e5a6a235b..8055f00696 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillSummon.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/handlers/SkillSummon.java @@ -30,10 +30,10 @@ import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeSummonInstance; import org.l2jmobius.gameserver.model.actor.instance.SummonInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; public class SkillSummon extends Skill { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/daemons/ItemsAutoDestroy.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/daemons/ItemsAutoDestroy.java index b9801f401d..e986679396 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/daemons/ItemsAutoDestroy.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/daemons/ItemsAutoDestroy.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; -import org.l2jmobius.gameserver.templates.item.EtcItemType; +import org.l2jmobius.gameserver.model.items.type.EtcItemType; public class ItemsAutoDestroy { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/MinionList.java index 178e802093..16082372a1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/MinionList.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.model.MinionData; import org.l2jmobius.gameserver.model.actor.instance.MinionInstance; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; -import org.l2jmobius.gameserver.templates.creatures.NpcTemplate; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; /** * @version $Revision: 1.2 $ $Date: 2004/06/27 08:12:59 $