Changeset 5083


Ignore:
Timestamp:
Nov 15, 2011 7:10:37 AM (6 months ago)
Author:
Zoey76
Message:

BETA: Rearranging Item related classes in core.

Location:
branches/unstable/L2J_Server_BETA/java/com/l2jserver
Files:
3 added
244 edited
15 moved

Legend:

Unmodified
Added
Removed

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/Item.java

    r4426 r5083  
    11/* 
    2  * $Header: Item.java, 2/08/2005 00:49:12 luisantonioa Exp $ 
    3  *  
    4  * $Author: luisantonioa $ $Date: 2/08/2005 00:49:12 $ $Revision: 1 $ $Log: 
    5  * Item.java,v $ Revision 1 2/08/2005 00:49:12 luisantonioa Added copyright 
    6  * notice 
    7  *  
    8  *  
    92 * This program is free software: you can redistribute it and/or modify it under 
    103 * the terms of the GNU General Public License as published by the Free Software 
    … …  
    2215package com.l2jserver.gameserver; 
    2316 
    24 import com.l2jserver.gameserver.templates.StatsSet; 
    25 import com.l2jserver.gameserver.templates.item.L2Item; 
     17import com.l2jserver.gameserver.model.StatsSet; 
     18import com.l2jserver.gameserver.model.item.L2Item; 
    2619 
    2720/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/ItemsAutoDestroy.java

    r4958 r5083  
    2222import com.l2jserver.Config; 
    2323import com.l2jserver.gameserver.instancemanager.ItemsOnGroundManager; 
    24 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2524import com.l2jserver.gameserver.model.L2World; 
    26 import com.l2jserver.gameserver.templates.item.L2EtcItemType; 
     25import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     26import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
    2727 
    2828public class ItemsAutoDestroy 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/RecipeController.java

    r5059 r5083  
    3636import com.l2jserver.Config; 
    3737import com.l2jserver.gameserver.datatables.ItemTable; 
    38 import com.l2jserver.gameserver.model.L2ItemInstance; 
    3938import com.l2jserver.gameserver.model.L2ManufactureItem; 
    4039import com.l2jserver.gameserver.model.L2RecipeInstance; 
    … …  
    4241import com.l2jserver.gameserver.model.L2RecipeStatInstance; 
    4342import com.l2jserver.gameserver.model.L2Skill; 
     43import com.l2jserver.gameserver.model.StatsSet; 
    4444import com.l2jserver.gameserver.model.TempItem; 
    4545import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     46import com.l2jserver.gameserver.model.item.L2Item; 
     47import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    4648import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
    4749import com.l2jserver.gameserver.network.SystemMessageId; 
    … …  
    5759import com.l2jserver.gameserver.skills.Stats; 
    5860import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager; 
    59 import com.l2jserver.gameserver.templates.StatsSet; 
    60 import com.l2jserver.gameserver.templates.item.L2Item; 
    6161import com.l2jserver.gameserver.util.Util; 
    6262import com.l2jserver.util.Rnd; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/SevenSigns.java

    r4994 r5083  
    4040import com.l2jserver.gameserver.model.AutoSpawnHandler.AutoSpawnInstance; 
    4141import com.l2jserver.gameserver.model.L2World; 
     42import com.l2jserver.gameserver.model.StatsSet; 
    4243import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    4344import com.l2jserver.gameserver.model.entity.Castle; 
    … …  
    4647import com.l2jserver.gameserver.network.serverpackets.SSQInfo; 
    4748import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    48 import com.l2jserver.gameserver.templates.StatsSet; 
    4949import com.l2jserver.gameserver.util.Broadcast; 
    5050 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/SevenSignsFestival.java

    r4981 r5083  
    4242import com.l2jserver.gameserver.model.L2CharPosition; 
    4343import com.l2jserver.gameserver.model.L2Clan; 
    44 import com.l2jserver.gameserver.model.L2ItemInstance; 
    4544import com.l2jserver.gameserver.model.L2Party; 
    4645import com.l2jserver.gameserver.model.L2Party.messageType; 
    … …  
    4847import com.l2jserver.gameserver.model.L2World; 
    4948import com.l2jserver.gameserver.model.SpawnListener; 
     49import com.l2jserver.gameserver.model.StatsSet; 
    5050import com.l2jserver.gameserver.model.actor.L2Npc; 
    5151import com.l2jserver.gameserver.model.actor.instance.L2FestivalMonsterInstance; 
    5252import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     53import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    5354import com.l2jserver.gameserver.network.NpcStringId; 
    5455import com.l2jserver.gameserver.network.SystemMessageId; 
    … …  
    5758import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse; 
    5859import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    59 import com.l2jserver.gameserver.templates.StatsSet; 
    6060import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    6161import com.l2jserver.gameserver.util.Util; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2CharacterAI.java

    r5010 r5083  
    3434import com.l2jserver.gameserver.model.L2CharPosition; 
    3535import com.l2jserver.gameserver.model.L2Effect; 
    36 import com.l2jserver.gameserver.model.L2ItemInstance; 
    37 import com.l2jserver.gameserver.model.L2ItemInstance.ItemLocation; 
    3836import com.l2jserver.gameserver.model.L2Object; 
    3937import com.l2jserver.gameserver.model.L2Skill; 
    … …  
    4442import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance; 
    4543import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     44import com.l2jserver.gameserver.model.item.L2Weapon; 
     45import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     46import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
     47import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
    4648import com.l2jserver.gameserver.network.SystemMessageId; 
    4749import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    … …  
    5052import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager; 
    5153import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    52 import com.l2jserver.gameserver.templates.item.L2Weapon; 
    53 import com.l2jserver.gameserver.templates.item.L2WeaponType; 
    5454import com.l2jserver.gameserver.templates.skills.L2SkillType; 
    5555import com.l2jserver.gameserver.templates.skills.L2TargetType; 
    5656import com.l2jserver.gameserver.util.Point3D; 
    5757import com.l2jserver.util.Rnd; 
     58 
    5859/** 
    5960 * This class manages AI of L2Character.<BR><BR> 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/AugmentationData.java

    r5057 r5083  
    3434import com.l2jserver.gameserver.model.L2Augmentation; 
    3535import com.l2jserver.gameserver.model.L2Skill; 
     36import com.l2jserver.gameserver.model.item.L2Item; 
    3637import com.l2jserver.gameserver.network.clientpackets.AbstractRefinePacket; 
    3738import com.l2jserver.gameserver.skills.Stats; 
    38 import com.l2jserver.gameserver.templates.item.L2Item; 
    3939import com.l2jserver.util.Rnd; 
    4040 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/CharSummonTable.java

    r5013 r5083  
    2727import com.l2jserver.L2DatabaseFactory; 
    2828import com.l2jserver.gameserver.idfactory.IdFactory; 
    29 import com.l2jserver.gameserver.model.L2ItemInstance; 
    3029import com.l2jserver.gameserver.model.L2SummonItem; 
    3130import com.l2jserver.gameserver.model.actor.instance.L2MerchantSummonInstance; 
    … …  
    3433import com.l2jserver.gameserver.model.actor.instance.L2SiegeSummonInstance; 
    3534import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance; 
     35import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3636import com.l2jserver.gameserver.network.serverpackets.PetItemList; 
    3737import com.l2jserver.gameserver.skills.l2skills.L2SkillSummon; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/CharTemplateTable.java

    r4707 r5083  
    2323 
    2424import com.l2jserver.L2DatabaseFactory; 
     25import com.l2jserver.gameserver.model.StatsSet; 
    2526import com.l2jserver.gameserver.model.base.ClassId; 
    26 import com.l2jserver.gameserver.templates.StatsSet; 
    2727import com.l2jserver.gameserver.templates.chars.L2PcTemplate; 
    2828 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/DoorTable.java

    r5002 r5083  
    3333import com.l2jserver.gameserver.instancemanager.InstanceManager; 
    3434import com.l2jserver.gameserver.instancemanager.MapRegionManager; 
     35import com.l2jserver.gameserver.model.StatsSet; 
    3536import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance; 
    3637import com.l2jserver.gameserver.model.entity.ClanHall; 
    3738import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall; 
    3839import com.l2jserver.gameserver.pathfinding.AbstractNodeLoc; 
    39 import com.l2jserver.gameserver.templates.StatsSet; 
    4040import com.l2jserver.gameserver.templates.chars.L2CharTemplate; 
    4141 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/EnchantHPBonusData.java

    r4972 r5083  
    3030 
    3131import com.l2jserver.Config; 
    32 import com.l2jserver.gameserver.model.L2ItemInstance; 
     32import com.l2jserver.gameserver.model.item.L2Item; 
     33import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3334import com.l2jserver.gameserver.skills.Stats; 
    3435import com.l2jserver.gameserver.skills.funcs.FuncTemplate; 
    3536import com.l2jserver.gameserver.skills.funcs.LambdaConst; 
    36 import com.l2jserver.gameserver.templates.item.L2Item; 
    3737 
    3838/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/HelperBuffTable.java

    r4921 r5083  
    2525 
    2626import com.l2jserver.L2DatabaseFactory; 
    27 import com.l2jserver.gameserver.templates.L2HelperBuff; 
    28 import com.l2jserver.gameserver.templates.StatsSet; 
     27import com.l2jserver.gameserver.model.L2HelperBuff; 
     28import com.l2jserver.gameserver.model.StatsSet; 
    2929 
    3030/** 
    3131 * This class represents the Newbie Helper Buff list 
    32  * 
    3332 * Author: Ayor 
    34  * 
    3533 */ 
    36  
    3734public class HelperBuffTable 
    3835{ 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/HennaTable.java

    r4972 r5083  
    2424 
    2525import com.l2jserver.L2DatabaseFactory; 
    26 import com.l2jserver.gameserver.templates.StatsSet; 
    27 import com.l2jserver.gameserver.templates.item.L2Henna; 
     26import com.l2jserver.gameserver.model.StatsSet; 
     27import com.l2jserver.gameserver.model.item.L2Henna; 
    2828 
    2929/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/HennaTreeTable.java

    r4417 r5083  
    2727 
    2828import com.l2jserver.L2DatabaseFactory; 
    29 import com.l2jserver.gameserver.model.L2HennaInstance; 
    3029import com.l2jserver.gameserver.model.base.ClassId; 
    31 import com.l2jserver.gameserver.templates.item.L2Henna; 
     30import com.l2jserver.gameserver.model.item.L2Henna; 
     31import com.l2jserver.gameserver.model.item.instance.L2HennaInstance; 
    3232 
    3333/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/ItemTable.java

    r4981 r5083  
    3333import com.l2jserver.gameserver.ThreadPoolManager; 
    3434import com.l2jserver.gameserver.idfactory.IdFactory; 
    35 import com.l2jserver.gameserver.model.L2ItemInstance; 
    36 import com.l2jserver.gameserver.model.L2ItemInstance.ItemLocation; 
    3735import com.l2jserver.gameserver.model.L2Object; 
    3836import com.l2jserver.gameserver.model.L2World; 
    … …  
    4038import com.l2jserver.gameserver.model.actor.instance.L2EventMonsterInstance; 
    4139import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     40import com.l2jserver.gameserver.model.item.L2Armor; 
     41import com.l2jserver.gameserver.model.item.L2EtcItem; 
     42import com.l2jserver.gameserver.model.item.L2Item; 
     43import com.l2jserver.gameserver.model.item.L2Weapon; 
     44import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     45import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
     46import com.l2jserver.gameserver.model.item.type.L2ArmorType; 
     47import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
    4248import com.l2jserver.gameserver.skills.SkillsEngine; 
    43 import com.l2jserver.gameserver.templates.item.L2Armor; 
    44 import com.l2jserver.gameserver.templates.item.L2ArmorType; 
    45 import com.l2jserver.gameserver.templates.item.L2EtcItem; 
    46 import com.l2jserver.gameserver.templates.item.L2Item; 
    47 import com.l2jserver.gameserver.templates.item.L2Weapon; 
    48 import com.l2jserver.gameserver.templates.item.L2WeaponType; 
    4949import com.l2jserver.gameserver.util.GMAudit; 
    5050 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/NpcTable.java

    r5031 r5083  
    3636import com.l2jserver.gameserver.model.L2NpcAIData; 
    3737import com.l2jserver.gameserver.model.L2Skill; 
     38import com.l2jserver.gameserver.model.StatsSet; 
    3839import com.l2jserver.gameserver.model.base.ClassId; 
    3940import com.l2jserver.gameserver.model.quest.Quest; 
    4041import com.l2jserver.gameserver.model.quest.Quest.QuestEventType; 
    4142import com.l2jserver.gameserver.skills.BaseStats; 
    42 import com.l2jserver.gameserver.templates.StatsSet; 
    4343import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    4444 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/PetDataTable.java

    r4972 r5083  
    3131import com.l2jserver.gameserver.model.L2PetLevelData; 
    3232import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
    33 import com.l2jserver.gameserver.templates.item.L2EtcItemType; 
    34 import com.l2jserver.gameserver.templates.item.L2Item; 
     33import com.l2jserver.gameserver.model.item.L2Item; 
     34import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
    3535 
    3636public class PetDataTable 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SkillTreesData.java

    r5045 r5083  
    3535import com.l2jserver.gameserver.model.L2Skill; 
    3636import com.l2jserver.gameserver.model.L2SkillLearn; 
     37import com.l2jserver.gameserver.model.StatsSet; 
    3738import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    3839import com.l2jserver.gameserver.model.base.ClassId; 
    3940import com.l2jserver.gameserver.model.base.Race; 
    4041import com.l2jserver.gameserver.model.base.SubClass; 
    41 import com.l2jserver.gameserver.templates.StatsSet; 
    4242import com.l2jserver.gameserver.util.Util; 
    4343import com.l2jserver.util.file.filter.XMLFilter; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/StaticObjects.java

    r4972 r5083  
    2828import com.l2jserver.Config; 
    2929import com.l2jserver.gameserver.idfactory.IdFactory; 
     30import com.l2jserver.gameserver.model.StatsSet; 
    3031import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance; 
    31 import com.l2jserver.gameserver.templates.StatsSet; 
    3232import com.l2jserver.gameserver.templates.chars.L2CharTemplate; 
    3333 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/handler/IItemHandler.java

    r4921 r5083  
    1717import java.util.logging.Logger; 
    1818 
    19 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2019import com.l2jserver.gameserver.model.actor.L2Playable; 
     20import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2121 
    2222 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/handler/ItemHandler.java

    r5080 r5083  
    1717import gnu.trove.map.hash.TIntObjectHashMap; 
    1818 
    19 import com.l2jserver.gameserver.templates.item.L2EtcItem; 
     19import com.l2jserver.gameserver.model.item.L2EtcItem; 
    2020 
    2121/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/AirShipManager.java

    r4972 r5083  
    2626import com.l2jserver.L2DatabaseFactory; 
    2727import com.l2jserver.gameserver.idfactory.IdFactory; 
     28import com.l2jserver.gameserver.model.StatsSet; 
    2829import com.l2jserver.gameserver.model.VehiclePathPoint; 
    2930import com.l2jserver.gameserver.model.actor.instance.L2AirShipInstance; 
    … …  
    3132import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    3233import com.l2jserver.gameserver.network.serverpackets.ExAirShipTeleportList; 
    33 import com.l2jserver.gameserver.templates.StatsSet; 
    3434import com.l2jserver.gameserver.templates.chars.L2CharTemplate; 
    3535 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/BoatManager.java

    r4972 r5083  
    2424import com.l2jserver.gameserver.idfactory.IdFactory; 
    2525import com.l2jserver.gameserver.model.L2World; 
     26import com.l2jserver.gameserver.model.StatsSet; 
    2627import com.l2jserver.gameserver.model.VehiclePathPoint; 
    2728import com.l2jserver.gameserver.model.actor.instance.L2BoatInstance; 
    2829import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2930import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket; 
    30 import com.l2jserver.gameserver.templates.StatsSet; 
    3131import com.l2jserver.gameserver.templates.chars.L2CharTemplate; 
    3232 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/CHSiegeManager.java

    r5038 r5083  
    2626import com.l2jserver.L2DatabaseFactory; 
    2727import com.l2jserver.gameserver.model.L2Clan; 
     28import com.l2jserver.gameserver.model.StatsSet; 
    2829import com.l2jserver.gameserver.model.actor.L2Character; 
    2930import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    … …  
    3334import com.l2jserver.gameserver.network.SystemMessageId; 
    3435import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    35 import com.l2jserver.gameserver.templates.StatsSet; 
    3636 
    3737/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/CastleManager.java

    r4981 r5083  
    2929import com.l2jserver.gameserver.model.L2Clan; 
    3030import com.l2jserver.gameserver.model.L2ClanMember; 
    31 import com.l2jserver.gameserver.model.L2ItemInstance; 
    3231import com.l2jserver.gameserver.model.L2Object; 
    3332import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    3433import com.l2jserver.gameserver.model.entity.Castle; 
     34import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3535 
    3636public class CastleManager implements InstanceListManager 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/ClanHallManager.java

    r4921 r5083  
    2828import com.l2jserver.gameserver.model.L2Clan; 
    2929import com.l2jserver.gameserver.model.L2Object; 
     30import com.l2jserver.gameserver.model.StatsSet; 
    3031import com.l2jserver.gameserver.model.entity.Auction; 
    3132import com.l2jserver.gameserver.model.entity.ClanHall; 
    … …  
    3334import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall; 
    3435import com.l2jserver.gameserver.model.zone.type.L2ClanHallZone; 
    35 import com.l2jserver.gameserver.templates.StatsSet; 
    3636 
    3737/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/CursedWeaponsManager.java

    r4707 r5083  
    3737import com.l2jserver.L2DatabaseFactory; 
    3838import com.l2jserver.gameserver.model.CursedWeapon; 
    39 import com.l2jserver.gameserver.model.L2ItemInstance; 
    4039import com.l2jserver.gameserver.model.actor.L2Attackable; 
    4140import com.l2jserver.gameserver.model.actor.L2Character; 
    … …  
    4847import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    4948import com.l2jserver.gameserver.model.actor.instance.L2RiftInvaderInstance; 
     49import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    5050import com.l2jserver.gameserver.network.SystemMessageId; 
    5151import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/DimensionalRiftManager.java

    r4976 r5083  
    3939import com.l2jserver.gameserver.datatables.NpcTable; 
    4040import com.l2jserver.gameserver.datatables.SpawnTable; 
    41 import com.l2jserver.gameserver.model.L2ItemInstance; 
    4241import com.l2jserver.gameserver.model.L2Spawn; 
    4342import com.l2jserver.gameserver.model.actor.L2Npc; 
    4443import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    4544import com.l2jserver.gameserver.model.entity.DimensionalRift; 
     45import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    4646import com.l2jserver.gameserver.model.quest.Quest; 
    4747import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/FortSiegeManager.java

    r4921 r5083  
    3535import com.l2jserver.gameserver.model.CombatFlag; 
    3636import com.l2jserver.gameserver.model.L2Clan; 
    37 import com.l2jserver.gameserver.model.L2ItemInstance; 
    3837import com.l2jserver.gameserver.model.L2Object; 
    3938import com.l2jserver.gameserver.model.Location; 
    … …  
    4241import com.l2jserver.gameserver.model.entity.Fort; 
    4342import com.l2jserver.gameserver.model.entity.FortSiege; 
     43import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    4444import com.l2jserver.gameserver.network.SystemMessageId; 
    4545import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    … …  
    342342                for (CombatFlag cf : fcf) 
    343343                { 
    344                         if (cf.itemInstance == item) 
     344                        if (cf.getCombatFlagInstance() == item) 
    345345                        { 
    346346                                cf.activate(player, item); 
    … …  
    392392                for (CombatFlag cf : fcf) 
    393393                { 
    394                         if (cf.playerId == player.getObjectId()) 
     394                        if (cf.getPlayerOnjectId() == player.getObjectId()) 
    395395                        { 
    396396                                cf.dropIt(); 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/FourSepulchersManager.java

    r4981 r5083  
    3737import com.l2jserver.gameserver.datatables.NpcTable; 
    3838import com.l2jserver.gameserver.datatables.SpawnTable; 
    39 import com.l2jserver.gameserver.model.L2ItemInstance; 
    4039import com.l2jserver.gameserver.model.L2Spawn; 
    4140import com.l2jserver.gameserver.model.actor.L2Npc; 
    … …  
    4443import com.l2jserver.gameserver.model.actor.instance.L2SepulcherMonsterInstance; 
    4544import com.l2jserver.gameserver.model.actor.instance.L2SepulcherNpcInstance; 
     45import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    4646import com.l2jserver.gameserver.model.quest.QuestState; 
    4747import com.l2jserver.gameserver.network.NpcStringId; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/GrandBossManager.java

    r5060 r5083  
    3333import com.l2jserver.gameserver.model.L2Object; 
    3434import com.l2jserver.gameserver.model.Location; 
     35import com.l2jserver.gameserver.model.StatsSet; 
    3536import com.l2jserver.gameserver.model.actor.L2Character; 
    3637import com.l2jserver.gameserver.model.actor.instance.L2GrandBossInstance; 
    3738import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    3839import com.l2jserver.gameserver.model.zone.type.L2BossZone; 
    39 import com.l2jserver.gameserver.templates.StatsSet; 
    4040import com.l2jserver.util.L2FastList; 
    4141 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/ItemsOnGroundManager.java

    r5035 r5083  
    2929import com.l2jserver.gameserver.ItemsAutoDestroy; 
    3030import com.l2jserver.gameserver.ThreadPoolManager; 
    31 import com.l2jserver.gameserver.model.L2ItemInstance; 
    3231import com.l2jserver.gameserver.model.L2World; 
    33 import com.l2jserver.gameserver.templates.item.L2EtcItemType; 
     32import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     33import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
    3434 
    3535/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/MercTicketManager.java

    r4921 r5083  
    2929import com.l2jserver.gameserver.idfactory.IdFactory; 
    3030import com.l2jserver.gameserver.model.AutoChatHandler; 
    31 import com.l2jserver.gameserver.model.L2ItemInstance; 
    3231import com.l2jserver.gameserver.model.L2World; 
    3332import com.l2jserver.gameserver.model.actor.instance.L2DefenderInstance; 
    3433import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    3534import com.l2jserver.gameserver.model.entity.Castle; 
     35import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3636import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3737 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/RaidBossSpawnManager.java

    r5013 r5083  
    3333import com.l2jserver.gameserver.datatables.SpawnTable; 
    3434import com.l2jserver.gameserver.model.L2Spawn; 
     35import com.l2jserver.gameserver.model.StatsSet; 
    3536import com.l2jserver.gameserver.model.actor.instance.L2RaidBossInstance; 
    36 import com.l2jserver.gameserver.templates.StatsSet; 
    3737import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3838import com.l2jserver.util.Rnd; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/ZoneManager.java

    r5011 r5083  
    3737 
    3838import com.l2jserver.Config; 
    39 import com.l2jserver.gameserver.model.L2ItemInstance; 
    4039import com.l2jserver.gameserver.model.L2Object; 
    4140import com.l2jserver.gameserver.model.L2World; 
    4241import com.l2jserver.gameserver.model.L2WorldRegion; 
    4342import com.l2jserver.gameserver.model.actor.L2Character; 
     43import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    4444import com.l2jserver.gameserver.model.zone.L2ZoneRespawn; 
    4545import com.l2jserver.gameserver.model.zone.L2ZoneType; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/games/Lottery.java

    r4981 r5083  
    2727import com.l2jserver.gameserver.Announcements; 
    2828import com.l2jserver.gameserver.ThreadPoolManager; 
    29 import com.l2jserver.gameserver.model.L2ItemInstance; 
     29import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3030import com.l2jserver.gameserver.network.SystemMessageId; 
    3131import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/ChanceCondition.java

    r4605 r5083  
    1919import java.util.logging.Logger; 
    2020 
    21 import com.l2jserver.gameserver.templates.StatsSet; 
    2221import com.l2jserver.util.Rnd; 
    2322 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/ClanWarehouse.java

    r4417 r5083  
    1616 
    1717import com.l2jserver.Config; 
    18 import com.l2jserver.gameserver.model.L2ItemInstance.ItemLocation; 
    1918import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     19import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
    2020import com.l2jserver.gameserver.model.itemcontainer.Warehouse; 
    2121 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/CombatFlag.java

    r4789 r5083  
    1818import com.l2jserver.gameserver.datatables.ItemTable; 
    1919import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     20import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2021import com.l2jserver.gameserver.network.SystemMessageId; 
    2122import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 
    … …  
    2829         
    2930        protected L2PcInstance _player = null; 
    30         public int playerId = 0; 
     31        private int _playerId = 0; 
    3132        private L2ItemInstance _item = null; 
    32          
    33          
    3433        private Location _location; 
    35         public L2ItemInstance itemInstance; 
    36          
     34        private L2ItemInstance _itemInstance; 
    3735        private int _itemId; 
    3836         
    … …  
    5553        { 
    5654                // Init the dropped L2ItemInstance and add it in the world as a visible object at the position where mob was last 
    57                 L2ItemInstance i = ItemTable.getInstance().createItem("Combat", _itemId, 1, null, null); 
    58                 i.dropMe(null, _location.getX(), _location.getY(),  _location.getZ()); 
    59                 itemInstance = i; 
     55                _itemInstance = ItemTable.getInstance().createItem("Combat", _itemId, 1, null, null); 
     56                _itemInstance.dropMe(null, _location.getX(), _location.getY(),  _location.getZ()); 
    6057        } 
    6158         
    … …  
    6663                        dropIt(); 
    6764                } 
    68                 if (itemInstance != null) 
     65                if (_itemInstance != null) 
    6966                { 
    70                         itemInstance.decayMe(); 
     67                        _itemInstance.decayMe(); 
    7168                } 
    7269        } 
    … …  
    7673                if (player.isMounted()) 
    7774                { 
    78                         player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CANNOT_EQUIP_ITEM_DUE_TO_BAD_CONDITION)); 
     75                        player.sendPacket(SystemMessageId.CANNOT_EQUIP_ITEM_DUE_TO_BAD_CONDITION); 
    7976                        return false; 
    8077                } 
    … …  
    8279                // Player holding it data 
    8380                _player = player; 
    84                 playerId = _player.getObjectId(); 
    85                 itemInstance = null; 
     81                _playerId = _player.getObjectId(); 
     82                _itemInstance = null; 
    8683                 
    8784                // Equip with the weapon 
    … …  
    117114                _player.broadcastUserInfo(); 
    118115                _player = null; 
    119                 playerId = 0; 
     116                _playerId = 0; 
     117        } 
     118         
     119        public int getPlayerOnjectId() 
     120        { 
     121                return _playerId; 
     122        } 
     123         
     124        public L2ItemInstance getCombatFlagInstance() 
     125        { 
     126                return _itemInstance; 
    120127        } 
    121128} 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/CursedWeapon.java

    r5058 r5083  
    3232import com.l2jserver.gameserver.model.actor.L2Character; 
    3333import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     34import com.l2jserver.gameserver.model.item.L2Item; 
     35import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3436import com.l2jserver.gameserver.network.SystemMessageId; 
    3537import com.l2jserver.gameserver.network.serverpackets.Earthquake; 
    … …  
    4042import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    4143import com.l2jserver.gameserver.network.serverpackets.UserInfo; 
    42 import com.l2jserver.gameserver.templates.item.L2Item; 
    4344import com.l2jserver.gameserver.util.Broadcast; 
    4445import com.l2jserver.gameserver.util.Point3D; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/ItemInfo.java

    r4921 r5083  
    1515package com.l2jserver.gameserver.model; 
    1616 
    17 import com.l2jserver.gameserver.templates.item.L2Item; 
     17import com.l2jserver.gameserver.model.item.L2Item; 
     18import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    1819 
    1920/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2ArmorSet.java

    r4921 r5083  
    1515 
    1616import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     17import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    1718import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
    1819 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2HelperBuff.java

    r5082 r5083  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.templates; 
     15package com.l2jserver.gameserver.model; 
    1616 
    1717/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Manor.java

    r5002 r5083  
    2828import com.l2jserver.Config; 
    2929import com.l2jserver.gameserver.datatables.ItemTable; 
    30 import com.l2jserver.gameserver.templates.item.L2Item; 
     30import com.l2jserver.gameserver.model.item.L2Item; 
    3131import com.l2jserver.gameserver.util.L2TIntObjectHashMap; 
    3232 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Party.java

    r4994 r5083  
    3838import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance; 
    3939import com.l2jserver.gameserver.model.entity.DimensionalRift; 
     40import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    4041import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
    4142import com.l2jserver.gameserver.network.SystemMessageId; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2RecipeList.java

    r4921 r5083  
    1515package com.l2jserver.gameserver.model; 
    1616 
    17 import com.l2jserver.gameserver.templates.StatsSet; 
    1817 
    1918/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Skill.java

    r5080 r5083  
    4242import com.l2jserver.gameserver.model.actor.instance.L2SiegeFlagInstance; 
    4343import com.l2jserver.gameserver.model.entity.TvTEvent; 
     44import com.l2jserver.gameserver.model.item.L2Armor; 
     45import com.l2jserver.gameserver.model.item.type.L2ArmorType; 
    4446import com.l2jserver.gameserver.network.SystemMessageId; 
    4547import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    … …  
    5153import com.l2jserver.gameserver.skills.funcs.Func; 
    5254import com.l2jserver.gameserver.skills.funcs.FuncTemplate; 
    53 import com.l2jserver.gameserver.templates.StatsSet; 
    5455import com.l2jserver.gameserver.templates.effects.EffectTemplate; 
    55 import com.l2jserver.gameserver.templates.item.L2Armor; 
    56 import com.l2jserver.gameserver.templates.item.L2ArmorType; 
    5756import com.l2jserver.gameserver.templates.skills.L2SkillType; 
    5857import com.l2jserver.gameserver.templates.skills.L2TargetType; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2SkillLearn.java

    r5045 r5083  
    2020import com.l2jserver.gameserver.model.base.ClassId; 
    2121import com.l2jserver.gameserver.model.base.Race; 
    22 import com.l2jserver.gameserver.templates.StatsSet; 
    2322 
    2423/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2TradeList.java

    r4981 r5083  
    3131import com.l2jserver.gameserver.ThreadPoolManager; 
    3232import com.l2jserver.gameserver.datatables.ItemTable; 
    33 import com.l2jserver.gameserver.templates.item.L2Item; 
     33import com.l2jserver.gameserver.model.item.L2Item; 
    3434 
    3535/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/ShortCuts.java

    r4989 r5083  
    2525import com.l2jserver.L2DatabaseFactory; 
    2626import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     27import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     28import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
    2729import com.l2jserver.gameserver.network.serverpackets.ExAutoSoulShot; 
    2830import com.l2jserver.gameserver.network.serverpackets.ShortCutInit; 
    2931import com.l2jserver.gameserver.network.serverpackets.ShortCutRegister; 
    30 import com.l2jserver.gameserver.templates.item.L2EtcItemType; 
    3132 
    3233/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/StatsSet.java

    r5082 r5083  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.templates; 
     15package com.l2jserver.gameserver.model; 
    1616 
    1717import java.util.Map; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/TempItem.java

    r4811 r5083  
    1414 */ 
    1515package com.l2jserver.gameserver.model; 
     16 
     17import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    1618 
    1719/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/TerritoryWard.java

    r4455 r5083  
    2020import com.l2jserver.gameserver.model.actor.L2Npc; 
    2121import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     22import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2223import com.l2jserver.gameserver.network.SystemMessageId; 
    2324import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/TradeItem.java

    r4997 r5083  
    1515package com.l2jserver.gameserver.model; 
    1616 
    17 import com.l2jserver.gameserver.templates.item.L2Item; 
     17import com.l2jserver.gameserver.model.item.L2Item; 
     18import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    1819 
    1920public class TradeItem 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/TradeList.java

    r4997 r5083  
    2626import com.l2jserver.gameserver.datatables.ItemTable; 
    2727import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     28import com.l2jserver.gameserver.model.item.L2Item; 
     29import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2830import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
    2931import com.l2jserver.gameserver.network.SystemMessageId; 
    … …  
    3234import com.l2jserver.gameserver.network.serverpackets.StatusUpdate; 
    3335import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    34 import com.l2jserver.gameserver.templates.item.L2Item; 
    3536import com.l2jserver.gameserver.util.Util; 
    3637 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Attackable.java

    r5020 r5083  
    4141import com.l2jserver.gameserver.model.L2DropCategory; 
    4242import com.l2jserver.gameserver.model.L2DropData; 
    43 import com.l2jserver.gameserver.model.L2ItemInstance; 
    4443import com.l2jserver.gameserver.model.L2Manor; 
    4544import com.l2jserver.gameserver.model.L2Object; 
    … …  
    5352import com.l2jserver.gameserver.model.actor.knownlist.AttackableKnownList; 
    5453import com.l2jserver.gameserver.model.actor.status.AttackableStatus; 
     54import com.l2jserver.gameserver.model.item.L2Item; 
     55import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     56import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
    5557import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
    5658import com.l2jserver.gameserver.model.quest.Quest; 
    … …  
    6264import com.l2jserver.gameserver.taskmanager.DecayTaskManager; 
    6365import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    64 import com.l2jserver.gameserver.templates.item.L2EtcItemType; 
    65 import com.l2jserver.gameserver.templates.item.L2Item; 
    6666import com.l2jserver.gameserver.util.L2TIntObjectHashMap; 
    6767import com.l2jserver.gameserver.util.Util; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

    r5080 r5083  
    5454import com.l2jserver.gameserver.model.L2CharPosition; 
    5555import com.l2jserver.gameserver.model.L2Effect; 
    56 import com.l2jserver.gameserver.model.L2ItemInstance; 
    5756import com.l2jserver.gameserver.model.L2Object; 
    5857import com.l2jserver.gameserver.model.L2Party; 
    … …  
    7271import com.l2jserver.gameserver.model.actor.status.CharStatus; 
    7372import com.l2jserver.gameserver.model.entity.Instance; 
     73import com.l2jserver.gameserver.model.item.L2Item; 
     74import com.l2jserver.gameserver.model.item.L2Weapon; 
     75import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     76import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
    7477import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
    7578import com.l2jserver.gameserver.model.quest.Quest; 
    … …  
    109112import com.l2jserver.gameserver.templates.chars.L2CharTemplate; 
    110113import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    111 import com.l2jserver.gameserver.templates.item.L2Item; 
    112 import com.l2jserver.gameserver.templates.item.L2Weapon; 
    113 import com.l2jserver.gameserver.templates.item.L2WeaponType; 
    114114import com.l2jserver.gameserver.templates.skills.L2EffectType; 
    115115import com.l2jserver.gameserver.templates.skills.L2SkillType; 
    … …  
    844844                stopEffectsOnAction(); 
    845845                 
    846                 // Get the active weapon instance (always equiped in the right hand) 
     846                // Get the active weapon instance (always equipped in the right hand) 
    847847                L2ItemInstance weaponInst = getActiveWeaponInstance(); 
    848848                 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Decoy.java

    r5013 r5083  
    1818import java.util.Collection; 
    1919 
    20 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2120import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     21import com.l2jserver.gameserver.model.item.L2Weapon; 
     22import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2223import com.l2jserver.gameserver.network.SystemMessageId; 
    2324import com.l2jserver.gameserver.network.serverpackets.CharInfo; 
    … …  
    2627import com.l2jserver.gameserver.templates.chars.L2CharTemplate; 
    2728import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    28 import com.l2jserver.gameserver.templates.item.L2Weapon; 
    2929 
    3030 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Npc.java

    r5080 r5083  
    3535import com.l2jserver.gameserver.instancemanager.TownManager; 
    3636import com.l2jserver.gameserver.instancemanager.WalkingManager; 
    37 import com.l2jserver.gameserver.model.L2ItemInstance; 
    3837import com.l2jserver.gameserver.model.L2NpcAIData; 
    3938import com.l2jserver.gameserver.model.L2Object; 
    … …  
    5958import com.l2jserver.gameserver.model.entity.Fort; 
    6059import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall; 
     60import com.l2jserver.gameserver.model.item.L2Item; 
     61import com.l2jserver.gameserver.model.item.L2Weapon; 
     62import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    6163import com.l2jserver.gameserver.model.olympiad.Olympiad; 
    6264import com.l2jserver.gameserver.model.quest.Quest; 
    … …  
    7476import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    7577import com.l2jserver.gameserver.templates.chars.L2NpcTemplate.AIType; 
    76 import com.l2jserver.gameserver.templates.item.L2Item; 
    77 import com.l2jserver.gameserver.templates.item.L2Weapon; 
    7878import com.l2jserver.gameserver.templates.skills.L2TargetType; 
    7979import com.l2jserver.gameserver.util.Broadcast; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Summon.java

    r5029 r5083  
    2424import com.l2jserver.gameserver.datatables.ItemTable; 
    2525import com.l2jserver.gameserver.instancemanager.TerritoryWarManager; 
    26 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2726import com.l2jserver.gameserver.model.L2Object; 
    2827import com.l2jserver.gameserver.model.L2Party; 
    … …  
    3938import com.l2jserver.gameserver.model.actor.stat.SummonStat; 
    4039import com.l2jserver.gameserver.model.actor.status.SummonStatus; 
     40import com.l2jserver.gameserver.model.item.L2EtcItem; 
     41import com.l2jserver.gameserver.model.item.L2Weapon; 
     42import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    4143import com.l2jserver.gameserver.model.itemcontainer.PetInventory; 
    4244import com.l2jserver.gameserver.model.olympiad.OlympiadGameManager; 
    … …  
    5759import com.l2jserver.gameserver.taskmanager.DecayTaskManager; 
    5860import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    59 import com.l2jserver.gameserver.templates.item.L2EtcItem; 
    60 import com.l2jserver.gameserver.templates.item.L2Weapon; 
    6161import com.l2jserver.gameserver.templates.skills.L2TargetType; 
    6262 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Trap.java

    r5058 r5083  
    1919 
    2020import com.l2jserver.gameserver.ThreadPoolManager; 
    21 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2221import com.l2jserver.gameserver.model.L2Skill; 
    2322import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2423import com.l2jserver.gameserver.model.actor.knownlist.TrapKnownList; 
     24import com.l2jserver.gameserver.model.item.L2Weapon; 
     25import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2526import com.l2jserver.gameserver.model.quest.Quest; 
    2627import com.l2jserver.gameserver.model.quest.Quest.TrapAction; 
    … …  
    3031import com.l2jserver.gameserver.taskmanager.DecayTaskManager; 
    3132import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    32 import com.l2jserver.gameserver.templates.item.L2Weapon; 
    3333 
    3434/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Vehicle.java

    r4771 r5083  
    2929import com.l2jserver.gameserver.instancemanager.MapRegionManager; 
    3030import com.l2jserver.gameserver.model.L2CharPosition; 
    31 import com.l2jserver.gameserver.model.L2ItemInstance; 
    3231import com.l2jserver.gameserver.model.L2World; 
    3332import com.l2jserver.gameserver.model.L2WorldRegion; 
    … …  
    3736import com.l2jserver.gameserver.model.actor.knownlist.VehicleKnownList; 
    3837import com.l2jserver.gameserver.model.actor.stat.VehicleStat; 
     38import com.l2jserver.gameserver.model.item.L2Weapon; 
     39import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3940import com.l2jserver.gameserver.network.SystemMessageId; 
    4041import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 
    … …  
    4243import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    4344import com.l2jserver.gameserver.templates.chars.L2CharTemplate; 
    44 import com.l2jserver.gameserver.templates.item.L2Weapon; 
    4545import com.l2jserver.gameserver.util.Util; 
    4646 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2BabyPetInstance.java

    r5001 r5083  
    2626import com.l2jserver.gameserver.datatables.SkillTable; 
    2727import com.l2jserver.gameserver.model.L2Effect; 
    28 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2928import com.l2jserver.gameserver.model.L2PetData.L2PetSkillLearn; 
    3029import com.l2jserver.gameserver.model.L2Skill; 
    3130import com.l2jserver.gameserver.model.actor.L2Character; 
     31import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3232import com.l2jserver.gameserver.network.SystemMessageId; 
    3333import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2BlockInstance.java

    r4921 r5083  
    1717import com.l2jserver.gameserver.datatables.ItemTable; 
    1818import com.l2jserver.gameserver.instancemanager.HandysBlockCheckerManager.ArenaParticipantsHolder; 
    19 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2019import com.l2jserver.gameserver.model.actor.L2Character; 
    2120import com.l2jserver.gameserver.model.entity.BlockCheckerEngine; 
     21import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2222import com.l2jserver.gameserver.network.serverpackets.AbstractNpcInfo; 
    2323import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2CastleChamberlainInstance.java

    r5057 r5083  
    2727import com.l2jserver.gameserver.datatables.TeleportLocationTable; 
    2828import com.l2jserver.gameserver.model.L2Clan; 
    29 import com.l2jserver.gameserver.model.L2ItemInstance; 
    3029import com.l2jserver.gameserver.model.L2Skill; 
    3130import com.l2jserver.gameserver.model.L2TeleportLocation; 
    3231import com.l2jserver.gameserver.model.entity.Castle; 
     32import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3333import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
    3434import com.l2jserver.gameserver.network.SystemMessageId; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2ClanTraderInstance.java

    r4537 r5083  
    1616 
    1717import com.l2jserver.Config; 
    18 import com.l2jserver.gameserver.model.L2ItemInstance; 
    1918import com.l2jserver.gameserver.model.actor.L2Npc; 
     19import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2020import com.l2jserver.gameserver.network.SystemMessageId; 
    2121import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2DoorInstance.java

    r5011 r5083  
    3131import com.l2jserver.gameserver.model.L2CharPosition; 
    3232import com.l2jserver.gameserver.model.L2Clan; 
    33 import com.l2jserver.gameserver.model.L2ItemInstance; 
    3433import com.l2jserver.gameserver.model.L2Object; 
    3534import com.l2jserver.gameserver.model.L2Skill; 
    … …  
    4342import com.l2jserver.gameserver.model.entity.Fort; 
    4443import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall; 
     44import com.l2jserver.gameserver.model.item.L2Weapon; 
     45import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    4546import com.l2jserver.gameserver.network.SystemMessageId; 
    4647import com.l2jserver.gameserver.network.serverpackets.DoorStatusUpdate; 
    … …  
    4950import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    5051import com.l2jserver.gameserver.templates.chars.L2CharTemplate; 
    51 import com.l2jserver.gameserver.templates.item.L2Weapon; 
    5252 
    5353/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FestivalMonsterInstance.java

    r4921 r5083  
    1616 
    1717import com.l2jserver.gameserver.SevenSignsFestival; 
    18 import com.l2jserver.gameserver.model.L2ItemInstance; 
    1918import com.l2jserver.gameserver.model.L2Party; 
    2019import com.l2jserver.gameserver.model.actor.L2Character; 
     20import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2121import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 
    2222import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2NpcBufferInstance.java

    r4972 r5083  
    2222import com.l2jserver.gameserver.datatables.NpcBufferTable; 
    2323import com.l2jserver.gameserver.datatables.SkillTable; 
    24 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2524import com.l2jserver.gameserver.model.L2Skill; 
    2625import com.l2jserver.gameserver.model.actor.L2Character; 
    2726import com.l2jserver.gameserver.model.actor.L2Npc; 
    2827import com.l2jserver.gameserver.model.actor.L2Summon; 
     28import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2929import com.l2jserver.gameserver.network.SystemMessageId; 
    3030import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

    r5080 r5083  
    106106import com.l2jserver.gameserver.model.L2EnchantSkillLearn; 
    107107import com.l2jserver.gameserver.model.L2Fishing; 
    108 import com.l2jserver.gameserver.model.L2HennaInstance; 
    109 import com.l2jserver.gameserver.model.L2ItemInstance; 
    110108import com.l2jserver.gameserver.model.L2Macro; 
    111109import com.l2jserver.gameserver.model.L2ManufactureItem; 
    … …  
    161159import com.l2jserver.gameserver.model.entity.Siege; 
    162160import com.l2jserver.gameserver.model.entity.TvTEvent; 
     161import com.l2jserver.gameserver.model.item.L2Armor; 
     162import com.l2jserver.gameserver.model.item.L2EtcItem; 
     163import com.l2jserver.gameserver.model.item.L2Henna; 
     164import com.l2jserver.gameserver.model.item.L2Item; 
     165import com.l2jserver.gameserver.model.item.L2Weapon; 
     166import com.l2jserver.gameserver.model.item.instance.L2HennaInstance; 
     167import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     168import com.l2jserver.gameserver.model.item.type.L2ArmorType; 
     169import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
     170import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
    163171import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
    164172import com.l2jserver.gameserver.model.itemcontainer.ItemContainer; 
    … …  
    259267import com.l2jserver.gameserver.templates.chars.L2PcTemplate; 
    260268import com.l2jserver.gameserver.templates.effects.EffectTemplate; 
    261 import com.l2jserver.gameserver.templates.item.L2Armor; 
    262 import com.l2jserver.gameserver.templates.item.L2ArmorType; 
    263 import com.l2jserver.gameserver.templates.item.L2EtcItem; 
    264 import com.l2jserver.gameserver.templates.item.L2EtcItemType; 
    265 import com.l2jserver.gameserver.templates.item.L2Henna; 
    266 import com.l2jserver.gameserver.templates.item.L2Item; 
    267 import com.l2jserver.gameserver.templates.item.L2Weapon; 
    268 import com.l2jserver.gameserver.templates.item.L2WeaponType; 
    269269import com.l2jserver.gameserver.templates.skills.L2EffectType; 
    270270import com.l2jserver.gameserver.templates.skills.L2SkillType; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java

    r5080 r5083  
    4141import com.l2jserver.gameserver.instancemanager.ItemsOnGroundManager; 
    4242import com.l2jserver.gameserver.model.L2Effect; 
    43 import com.l2jserver.gameserver.model.L2ItemInstance; 
    4443import com.l2jserver.gameserver.model.L2Object; 
    4544import com.l2jserver.gameserver.model.L2PetData; 
    … …  
    5049import com.l2jserver.gameserver.model.actor.L2Summon; 
    5150import com.l2jserver.gameserver.model.actor.stat.PetStat; 
     51import com.l2jserver.gameserver.model.item.L2Item; 
     52import com.l2jserver.gameserver.model.item.L2Weapon; 
     53import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     54import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
    5255import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
    5356import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
    … …  
    6669import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    6770import com.l2jserver.gameserver.templates.effects.EffectTemplate; 
    68 import com.l2jserver.gameserver.templates.item.L2EtcItemType; 
    69 import com.l2jserver.gameserver.templates.item.L2Item; 
    70 import com.l2jserver.gameserver.templates.item.L2Weapon; 
    7171import com.l2jserver.gameserver.util.Util; 
    7272import com.l2jserver.util.Rnd; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2RaceManagerInstance.java

    r5013 r5083  
    2222import com.l2jserver.gameserver.ThreadPoolManager; 
    2323import com.l2jserver.gameserver.idfactory.IdFactory; 
    24 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2524import com.l2jserver.gameserver.model.actor.L2Npc; 
    2625import com.l2jserver.gameserver.model.actor.knownlist.RaceManagerKnownList; 
     26import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2727import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
    2828import com.l2jserver.gameserver.network.SystemMessageId; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherNpcInstance.java

    r5058 r5083  
    2424import com.l2jserver.gameserver.datatables.DoorTable; 
    2525import com.l2jserver.gameserver.instancemanager.FourSepulchersManager; 
    26 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2726import com.l2jserver.gameserver.model.L2World; 
    2827import com.l2jserver.gameserver.model.actor.L2Npc; 
     28import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2929import com.l2jserver.gameserver.model.quest.Quest; 
    3030import com.l2jserver.gameserver.network.NpcStringId; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SignsPriestInstance.java

    r4994 r5083  
    2323import com.l2jserver.gameserver.SevenSigns; 
    2424import com.l2jserver.gameserver.cache.HtmCache; 
    25 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2625import com.l2jserver.gameserver.model.actor.L2Npc; 
     26import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2727import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
    2828import com.l2jserver.gameserver.network.SystemMessageId; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2StaticObjectInstance.java

    r4921 r5083  
    11/* 
    2  * $Header: /cvsroot/l2j/L2_Gameserver/java/net/sf/l2j/gameserver/model/L2StaticObjectInstance.java,v 1.3.2.2.2.2 2005/02/04 13:05:27 maximas Exp $ 
    3  * 
    4  * 
    52 * This program is free software: you can redistribute it and/or modify it under 
    63 * the terms of the GNU General Public License as published by the Free Software 
    … …  
    2219import com.l2jserver.gameserver.ai.L2CharacterAI; 
    2320import com.l2jserver.gameserver.model.L2CharPosition; 
    24 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2521import com.l2jserver.gameserver.model.L2Skill; 
    2622import com.l2jserver.gameserver.model.actor.L2Character; 
    … …  
    2824import com.l2jserver.gameserver.model.actor.stat.StaticObjStat; 
    2925import com.l2jserver.gameserver.model.actor.status.StaticObjStatus; 
     26import com.l2jserver.gameserver.model.item.L2Weapon; 
     27import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3028import com.l2jserver.gameserver.network.serverpackets.ShowTownMap; 
    3129import com.l2jserver.gameserver.network.serverpackets.StaticObject; 
    3230import com.l2jserver.gameserver.templates.chars.L2CharTemplate; 
    33 import com.l2jserver.gameserver.templates.item.L2Weapon; 
    3431 
    3532/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2TamedBeastInstance.java

    r5058 r5083  
    2525import com.l2jserver.gameserver.ai.CtrlIntention; 
    2626import com.l2jserver.gameserver.datatables.SkillTable; 
    27 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2827import com.l2jserver.gameserver.model.L2Object; 
    2928import com.l2jserver.gameserver.model.L2Skill; 
    3029import com.l2jserver.gameserver.model.actor.L2Character; 
     30import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3131import com.l2jserver.gameserver.network.serverpackets.AbstractNpcInfo; 
    3232import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2TransformManagerInstance.java

    r4958 r5083  
    2222import com.l2jserver.gameserver.datatables.SkillTreesData; 
    2323import com.l2jserver.gameserver.instancemanager.QuestManager; 
    24 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2524import com.l2jserver.gameserver.model.L2Skill; 
    2625import com.l2jserver.gameserver.model.L2SkillLearn; 
     26import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2727import com.l2jserver.gameserver.model.quest.QuestState; 
    2828import com.l2jserver.gameserver.network.SystemMessageId; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2WeddingManagerInstance.java

    r4884 r5083  
    1919import com.l2jserver.gameserver.datatables.SkillTable; 
    2020import com.l2jserver.gameserver.instancemanager.CoupleManager; 
    21 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2221import com.l2jserver.gameserver.model.L2Skill; 
    2322import com.l2jserver.gameserver.model.L2World; 
    2423import com.l2jserver.gameserver.model.actor.L2Npc; 
    2524import com.l2jserver.gameserver.model.entity.Couple; 
     25import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2626import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse; 
    2727import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/stat/CharStat.java

    r5010 r5083  
    1717import com.l2jserver.Config; 
    1818import com.l2jserver.gameserver.model.Elementals; 
    19 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2019import com.l2jserver.gameserver.model.L2Skill; 
    2120import com.l2jserver.gameserver.model.actor.L2Character; 
     21import com.l2jserver.gameserver.model.item.L2Weapon; 
     22import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     23import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
    2224import com.l2jserver.gameserver.skills.Calculator; 
    2325import com.l2jserver.gameserver.skills.Env; 
    2426import com.l2jserver.gameserver.skills.Stats; 
    25 import com.l2jserver.gameserver.templates.item.L2Weapon; 
    26 import com.l2jserver.gameserver.templates.item.L2WeaponType; 
    2727 
    2828public class CharStat 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/BlockCheckerEngine.java

    r4921 r5083  
    3030import com.l2jserver.gameserver.instancemanager.HandysBlockCheckerManager; 
    3131import com.l2jserver.gameserver.instancemanager.HandysBlockCheckerManager.ArenaParticipantsHolder; 
    32 import com.l2jserver.gameserver.model.L2ItemInstance; 
    3332import com.l2jserver.gameserver.model.L2Skill; 
    3433import com.l2jserver.gameserver.model.L2Spawn; 
    … …  
    3736import com.l2jserver.gameserver.model.actor.instance.L2BlockInstance; 
    3837import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     38import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3939import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
    4040import com.l2jserver.gameserver.network.SystemMessageId; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/ClanHall.java

    r4994 r5083  
    3131import com.l2jserver.gameserver.datatables.ClanTable; 
    3232import com.l2jserver.gameserver.model.L2Clan; 
     33import com.l2jserver.gameserver.model.StatsSet; 
    3334import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance; 
    3435import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    … …  
    3637import com.l2jserver.gameserver.model.zone.type.L2ClanHallZone; 
    3738import com.l2jserver.gameserver.network.serverpackets.PledgeShowInfoUpdate; 
    38 import com.l2jserver.gameserver.templates.StatsSet; 
    3939 
    4040public abstract class ClanHall 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Hero.java

    r5054 r5083  
    4545import com.l2jserver.gameserver.instancemanager.CastleManager; 
    4646import com.l2jserver.gameserver.model.L2Clan; 
    47 import com.l2jserver.gameserver.model.L2ItemInstance; 
    4847import com.l2jserver.gameserver.model.L2World; 
     48import com.l2jserver.gameserver.model.StatsSet; 
    4949import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     50import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    5051import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
    5152import com.l2jserver.gameserver.model.olympiad.Olympiad; 
    … …  
    5657import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    5758import com.l2jserver.gameserver.network.serverpackets.UserInfo; 
    58 import com.l2jserver.gameserver.templates.StatsSet; 
    5959import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    6060import com.l2jserver.util.StringUtil; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/clanhall/AuctionableHall.java

    r4994 r5083  
    2626import com.l2jserver.gameserver.instancemanager.ClanHallManager; 
    2727import com.l2jserver.gameserver.model.L2Clan; 
     28import com.l2jserver.gameserver.model.StatsSet; 
    2829import com.l2jserver.gameserver.model.entity.ClanHall; 
    2930import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
    3031import com.l2jserver.gameserver.network.SystemMessageId; 
    3132import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    32 import com.l2jserver.gameserver.templates.StatsSet; 
    3333 
    3434public final class AuctionableHall extends ClanHall 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/clanhall/SiegableHall.java

    r5011 r5083  
    2828import com.l2jserver.gameserver.model.L2SiegeClan; 
    2929import com.l2jserver.gameserver.model.L2SiegeClan.SiegeClanType; 
     30import com.l2jserver.gameserver.model.StatsSet; 
    3031import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance; 
    3132import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    … …  
    3435import com.l2jserver.gameserver.model.zone.type.L2SiegeZone; 
    3536import com.l2jserver.gameserver.network.serverpackets.SiegeInfo; 
    36 import com.l2jserver.gameserver.templates.StatsSet; 
    3737 
    3838/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/item/L2Armor.java

    r5082 r5083  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.templates.item; 
     15package com.l2jserver.gameserver.model.item; 
    1616 
    1717import java.util.ArrayList; 
    1818 
    19 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2019import com.l2jserver.gameserver.model.L2Skill; 
     20import com.l2jserver.gameserver.model.StatsSet; 
    2121import com.l2jserver.gameserver.model.actor.L2Character; 
     22import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     23import com.l2jserver.gameserver.model.item.type.L2ArmorType; 
    2224import com.l2jserver.gameserver.skills.Env; 
    2325import com.l2jserver.gameserver.skills.SkillHolder; 
    2426import com.l2jserver.gameserver.skills.funcs.Func; 
    2527import com.l2jserver.gameserver.skills.funcs.FuncTemplate; 
    26 import com.l2jserver.gameserver.templates.StatsSet; 
    2728import com.l2jserver.util.StringUtil; 
    2829 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/item/L2EtcItem.java

    r5082 r5083  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.templates.item; 
     15package com.l2jserver.gameserver.model.item; 
    1616 
    1717import java.util.ArrayList; 
    … …  
    1919 
    2020import com.l2jserver.gameserver.model.L2ExtractableProduct; 
     21import com.l2jserver.gameserver.model.StatsSet; 
     22import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
    2123import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
    22 import com.l2jserver.gameserver.templates.StatsSet; 
    2324import com.l2jserver.util.StringUtil; 
    2425 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/item/L2Henna.java

    r5082 r5083  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.templates.item; 
     15package com.l2jserver.gameserver.model.item; 
    1616 
    17 import com.l2jserver.gameserver.templates.StatsSet; 
     17import com.l2jserver.gameserver.model.StatsSet; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/item/L2Item.java

    r5082 r5083  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.templates.item; 
     15package com.l2jserver.gameserver.model.item; 
    1616 
    1717import java.util.ArrayList; 
    … …  
    2626import com.l2jserver.gameserver.model.Elementals; 
    2727import com.l2jserver.gameserver.model.L2Effect; 
    28 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2928import com.l2jserver.gameserver.model.L2Object; 
     29import com.l2jserver.gameserver.model.StatsSet; 
    3030import com.l2jserver.gameserver.model.actor.L2Character; 
    3131import com.l2jserver.gameserver.model.actor.L2Summon; 
    3232import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     33import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     34import com.l2jserver.gameserver.model.item.type.L2ActionType; 
     35import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
     36import com.l2jserver.gameserver.model.item.type.L2ItemType; 
    3337import com.l2jserver.gameserver.model.quest.Quest; 
    3438import com.l2jserver.gameserver.network.SystemMessageId; 
    … …  
    4145import com.l2jserver.gameserver.skills.funcs.Func; 
    4246import com.l2jserver.gameserver.skills.funcs.FuncTemplate; 
    43 import com.l2jserver.gameserver.templates.StatsSet; 
    4447import com.l2jserver.gameserver.templates.effects.EffectTemplate; 
    4548import com.l2jserver.util.StringUtil; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/item/L2WarehouseItem.java

    r5082 r5083  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.templates.item; 
     15package com.l2jserver.gameserver.model.item; 
    1616 
    17 import com.l2jserver.gameserver.model.L2ItemInstance; 
     17import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     18import com.l2jserver.gameserver.model.item.type.L2ItemType; 
    1819 
    1920/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/item/L2Weapon.java

    r5082 r5083  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.templates.item; 
     15package com.l2jserver.gameserver.model.item; 
    1616 
    1717import java.util.ArrayList; 
    … …  
    2424import com.l2jserver.gameserver.handler.SkillHandler; 
    2525import com.l2jserver.gameserver.model.L2Effect; 
    26 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2726import com.l2jserver.gameserver.model.L2Object; 
    2827import com.l2jserver.gameserver.model.L2Skill; 
     28import com.l2jserver.gameserver.model.StatsSet; 
    2929import com.l2jserver.gameserver.model.actor.L2Character; 
    3030import com.l2jserver.gameserver.model.actor.L2Npc; 
    3131import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     32import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     33import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
    3234import com.l2jserver.gameserver.model.quest.Quest; 
    3335import com.l2jserver.gameserver.skills.Env; 
    … …  
    3840import com.l2jserver.gameserver.skills.funcs.Func; 
    3941import com.l2jserver.gameserver.skills.funcs.FuncTemplate; 
    40 import com.l2jserver.gameserver.templates.StatsSet; 
    4142import com.l2jserver.gameserver.templates.skills.L2SkillType; 
    4243import com.l2jserver.util.StringUtil; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/item/instance/L2HennaInstance.java

    r5082 r5083  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.model; 
     15package com.l2jserver.gameserver.model.item.instance; 
    1616 
    17 import com.l2jserver.gameserver.templates.item.L2Henna; 
     17import com.l2jserver.gameserver.model.item.L2Henna; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/item/instance/L2ItemInstance.java

    r5082 r5083  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.model; 
     15package com.l2jserver.gameserver.model.item.instance; 
    1616 
    1717import static com.l2jserver.gameserver.model.itemcontainer.PcInventory.ADENA_ID; 
    … …  
    3535import com.l2jserver.gameserver.instancemanager.ItemsOnGroundManager; 
    3636import com.l2jserver.gameserver.instancemanager.MercTicketManager; 
     37import com.l2jserver.gameserver.model.DropProtection; 
     38import com.l2jserver.gameserver.model.Elementals; 
     39import com.l2jserver.gameserver.model.L2Augmentation; 
     40import com.l2jserver.gameserver.model.L2Object; 
     41import com.l2jserver.gameserver.model.L2World; 
     42import com.l2jserver.gameserver.model.L2WorldRegion; 
     43import com.l2jserver.gameserver.model.Location; 
    3744import com.l2jserver.gameserver.model.actor.L2Character; 
    3845import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    3946import com.l2jserver.gameserver.model.actor.knownlist.NullKnownList; 
     47import com.l2jserver.gameserver.model.item.L2Armor; 
     48import com.l2jserver.gameserver.model.item.L2EtcItem; 
     49import com.l2jserver.gameserver.model.item.L2Item; 
     50import com.l2jserver.gameserver.model.item.L2Weapon; 
     51import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
     52import com.l2jserver.gameserver.model.item.type.L2ItemType; 
    4053import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
    4154import com.l2jserver.gameserver.model.quest.QuestState; 
    … …  
    4962import com.l2jserver.gameserver.skills.SkillHolder; 
    5063import com.l2jserver.gameserver.skills.funcs.Func; 
    51 import com.l2jserver.gameserver.templates.item.L2Armor; 
    52 import com.l2jserver.gameserver.templates.item.L2EtcItem; 
    53 import com.l2jserver.gameserver.templates.item.L2EtcItemType; 
    54 import com.l2jserver.gameserver.templates.item.L2Item; 
    55 import com.l2jserver.gameserver.templates.item.L2ItemType; 
    56 import com.l2jserver.gameserver.templates.item.L2Weapon; 
    5764import com.l2jserver.gameserver.util.GMAudit; 
    5865 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/item/type/L2ActionType.java

    r5082 r5083  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.templates.item; 
     15package com.l2jserver.gameserver.model.item.type; 
    1616 
    1717/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/item/type/L2ArmorType.java

    r5082 r5083  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.templates.item; 
     15package com.l2jserver.gameserver.model.item.type; 
    1616 
    1717/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/item/type/L2EtcItemType.java

    r5082 r5083  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.templates.item; 
     15package com.l2jserver.gameserver.model.item.type; 
    1616 
    1717/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/item/type/L2ItemType.java

    r5082 r5083  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.templates.item; 
     15package com.l2jserver.gameserver.model.item.type; 
    1616 
    1717/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/item/type/L2WeaponType.java

    r5082 r5083  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.templates.item; 
     15package com.l2jserver.gameserver.model.item.type; 
    1616 
    1717/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemauction/AuctionDateGenerator.java

    r4746 r5083  
    1818import java.util.concurrent.TimeUnit; 
    1919 
    20 import com.l2jserver.gameserver.templates.StatsSet; 
     20import com.l2jserver.gameserver.model.StatsSet; 
    2121 
    2222/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemauction/AuctionItem.java

    r4417 r5083  
    1717import com.l2jserver.gameserver.datatables.ItemTable; 
    1818import com.l2jserver.gameserver.model.L2Augmentation; 
    19 import com.l2jserver.gameserver.model.L2ItemInstance; 
    20 import com.l2jserver.gameserver.templates.StatsSet; 
    21 import com.l2jserver.gameserver.templates.item.L2Item; 
     19import com.l2jserver.gameserver.model.StatsSet; 
     20import com.l2jserver.gameserver.model.item.L2Item; 
     21import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2222 
    2323/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemauction/ItemAuction.java

    r4884 r5083  
    2828import com.l2jserver.gameserver.instancemanager.ItemAuctionManager; 
    2929import com.l2jserver.gameserver.model.ItemInfo; 
    30 import com.l2jserver.gameserver.model.L2ItemInstance; 
    3130import com.l2jserver.gameserver.model.L2World; 
    3231import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     32import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3333import com.l2jserver.gameserver.network.SystemMessageId; 
    3434import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemauction/ItemAuctionInstance.java

    r5002 r5083  
    4040import com.l2jserver.gameserver.datatables.CharNameTable; 
    4141import com.l2jserver.gameserver.instancemanager.ItemAuctionManager; 
    42 import com.l2jserver.gameserver.model.L2ItemInstance; 
    43 import com.l2jserver.gameserver.model.L2ItemInstance.ItemLocation; 
    4442import com.l2jserver.gameserver.model.L2World; 
     43import com.l2jserver.gameserver.model.StatsSet; 
    4544import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     45import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     46import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
    4647import com.l2jserver.gameserver.network.SystemMessageId; 
    4748import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    48 import com.l2jserver.gameserver.templates.StatsSet; 
    4949import com.l2jserver.util.Rnd; 
    5050 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java

    r4970 r5083  
    3030import com.l2jserver.gameserver.datatables.SkillTable; 
    3131import com.l2jserver.gameserver.model.L2ArmorSet; 
    32 import com.l2jserver.gameserver.model.L2ItemInstance; 
    33 import com.l2jserver.gameserver.model.L2ItemInstance.ItemLocation; 
    3432import com.l2jserver.gameserver.model.L2Skill; 
    3533import com.l2jserver.gameserver.model.L2World; 
    3634import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     35import com.l2jserver.gameserver.model.item.L2Armor; 
     36import com.l2jserver.gameserver.model.item.L2Item; 
     37import com.l2jserver.gameserver.model.item.L2Weapon; 
     38import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     39import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
     40import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
     41import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
    3742import com.l2jserver.gameserver.network.serverpackets.SkillCoolTime; 
    3843import com.l2jserver.gameserver.skills.SkillHolder; 
    3944import com.l2jserver.gameserver.skills.Stats; 
    40 import com.l2jserver.gameserver.templates.item.L2Armor; 
    41 import com.l2jserver.gameserver.templates.item.L2EtcItemType; 
    42 import com.l2jserver.gameserver.templates.item.L2Item; 
    43 import com.l2jserver.gameserver.templates.item.L2Weapon; 
    44 import com.l2jserver.gameserver.templates.item.L2WeaponType; 
    4545import com.l2jserver.util.StringUtil; 
    4646 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/ItemContainer.java

    r4994 r5083  
    2828import com.l2jserver.gameserver.GameTimeController; 
    2929import com.l2jserver.gameserver.datatables.ItemTable; 
    30 import com.l2jserver.gameserver.model.L2ItemInstance; 
    31 import com.l2jserver.gameserver.model.L2ItemInstance.ItemLocation; 
    3230import com.l2jserver.gameserver.model.L2Object; 
    3331import com.l2jserver.gameserver.model.L2World; 
    3432import com.l2jserver.gameserver.model.actor.L2Character; 
    3533import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    36 import com.l2jserver.gameserver.templates.item.L2Item; 
     34import com.l2jserver.gameserver.model.item.L2Item; 
     35import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     36import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
    3737 
    3838/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/Mail.java

    r4417 r5083  
    2121 
    2222import com.l2jserver.L2DatabaseFactory; 
    23 import com.l2jserver.gameserver.model.L2ItemInstance; 
    24 import com.l2jserver.gameserver.model.L2ItemInstance.ItemLocation; 
    2523import com.l2jserver.gameserver.model.L2World; 
    2624import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     25import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     26import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
    2727 
    2828/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/PcFreight.java

    r4909 r5083  
    2323 
    2424import com.l2jserver.Config; 
    25 import com.l2jserver.gameserver.model.L2ItemInstance; 
    26 import com.l2jserver.gameserver.model.L2ItemInstance.ItemLocation; 
    2725import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     26import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     27import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
    2828import com.l2jserver.gameserver.skills.Stats; 
    2929 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/PcInventory.java

    r5076 r5083  
    2525import com.l2jserver.L2DatabaseFactory; 
    2626import com.l2jserver.gameserver.datatables.ItemTable; 
    27 import com.l2jserver.gameserver.model.L2ItemInstance; 
    28 import com.l2jserver.gameserver.model.L2ItemInstance.ItemLocation; 
    2927import com.l2jserver.gameserver.model.TradeItem; 
    3028import com.l2jserver.gameserver.model.TradeList; 
    3129import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     30import com.l2jserver.gameserver.model.item.L2Item; 
     31import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     32import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
     33import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
    3234import com.l2jserver.gameserver.network.SystemMessageId; 
    3335import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 
    3436import com.l2jserver.gameserver.network.serverpackets.ItemList; 
    3537import com.l2jserver.gameserver.network.serverpackets.StatusUpdate; 
    36 import com.l2jserver.gameserver.templates.item.L2EtcItemType; 
    37 import com.l2jserver.gameserver.templates.item.L2Item; 
    3838import com.l2jserver.gameserver.util.Util; 
    3939 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/PcRefund.java

    r4974 r5083  
    1818 
    1919import com.l2jserver.gameserver.datatables.ItemTable; 
    20 import com.l2jserver.gameserver.model.L2ItemInstance; 
    21 import com.l2jserver.gameserver.model.L2ItemInstance.ItemLocation; 
    2220import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     21import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     22import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
    2323 
    2424/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/PcWarehouse.java

    r4622 r5083  
    1515package com.l2jserver.gameserver.model.itemcontainer; 
    1616 
    17 import com.l2jserver.gameserver.model.L2ItemInstance.ItemLocation; 
    1817import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     18import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
    1919 
    2020public class PcWarehouse extends Warehouse 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/PetInventory.java

    r4426 r5083  
    1616 
    1717import com.l2jserver.gameserver.datatables.ItemTable; 
    18 import com.l2jserver.gameserver.model.L2ItemInstance; 
    19 import com.l2jserver.gameserver.model.L2ItemInstance.ItemLocation; 
    2018import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
    21 import com.l2jserver.gameserver.templates.item.L2EtcItemType; 
    22 import com.l2jserver.gameserver.templates.item.L2Item; 
     19import com.l2jserver.gameserver.model.item.L2Item; 
     20import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     21import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
     22import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
    2323 
    2424public class PetInventory extends Inventory 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/multisell/Ingredient.java

    r4921 r5083  
    1616 
    1717import com.l2jserver.gameserver.datatables.ItemTable; 
    18 import com.l2jserver.gameserver.model.L2ItemInstance; 
    19 import com.l2jserver.gameserver.templates.item.L2Armor; 
    20 import com.l2jserver.gameserver.templates.item.L2Item; 
    21 import com.l2jserver.gameserver.templates.item.L2Weapon; 
     18import com.l2jserver.gameserver.model.item.L2Armor; 
     19import com.l2jserver.gameserver.model.item.L2Item; 
     20import com.l2jserver.gameserver.model.item.L2Weapon; 
     21import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2222 
    2323/** 
    24  *  
    2524 * @author DS 
    26  * 
    2725 */ 
    2826public class Ingredient 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/multisell/ItemInfo.java

    r4417 r5083  
    1616 
    1717import com.l2jserver.gameserver.model.Elementals; 
    18 import com.l2jserver.gameserver.model.L2ItemInstance; 
     18import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    1919 
    2020/** 
    21  *  
    2221 * @author DS 
    23  * 
    2422 */ 
    2523public class ItemInfo 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/multisell/PreparedEntry.java

    r4903 r5083  
    1919import java.util.ArrayList; 
    2020 
    21 import com.l2jserver.gameserver.model.L2ItemInstance; 
     21import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2222 
    2323/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/multisell/PreparedListContainer.java

    r4417 r5083  
    1919import javolution.util.FastList; 
    2020 
    21 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2221import com.l2jserver.gameserver.model.actor.L2Npc; 
    2322import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    24 import com.l2jserver.gameserver.templates.item.L2Armor; 
    25 import com.l2jserver.gameserver.templates.item.L2Weapon; 
     23import com.l2jserver.gameserver.model.item.L2Armor; 
     24import com.l2jserver.gameserver.model.item.L2Weapon; 
     25import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2626 
    2727public class PreparedListContainer extends ListContainer 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/olympiad/AbstractOlympiadGame.java

    r5065 r5083  
    2626import com.l2jserver.gameserver.instancemanager.FortManager; 
    2727import com.l2jserver.gameserver.instancemanager.QuestManager; 
    28 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2928import com.l2jserver.gameserver.model.L2Party; 
    3029import com.l2jserver.gameserver.model.L2Party.messageType; 
    … …  
    3635import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
    3736import com.l2jserver.gameserver.model.entity.TvTEvent; 
     37import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3838import com.l2jserver.gameserver.model.quest.Quest; 
    3939import com.l2jserver.gameserver.model.zone.type.L2OlympiadStadiumZone; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/olympiad/Olympiad.java

    r5069 r5083  
    4646import com.l2jserver.gameserver.instancemanager.AntiFeedManager; 
    4747import com.l2jserver.gameserver.instancemanager.ZoneManager; 
     48import com.l2jserver.gameserver.model.StatsSet; 
    4849import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    4950import com.l2jserver.gameserver.model.entity.Hero; 
    5051import com.l2jserver.gameserver.network.SystemMessageId; 
    5152import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    52 import com.l2jserver.gameserver.templates.StatsSet; 
    5353import com.l2jserver.util.L2FastList; 
    5454 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/olympiad/OlympiadManager.java

    r4981 r5083  
    2727import com.l2jserver.gameserver.model.L2Party; 
    2828import com.l2jserver.gameserver.model.L2World; 
     29import com.l2jserver.gameserver.model.StatsSet; 
    2930import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    3031import com.l2jserver.gameserver.model.entity.TvTEvent; 
    … …  
    3233import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    3334import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    34 import com.l2jserver.gameserver.templates.StatsSet; 
    3535 
    3636/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/olympiad/Participant.java

    r4484 r5083  
    1616 
    1717import com.l2jserver.gameserver.model.L2World; 
     18import com.l2jserver.gameserver.model.StatsSet; 
    1819import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    19 import com.l2jserver.gameserver.templates.StatsSet; 
    2020 
    2121/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/quest/Quest.java

    r5065 r5083  
    4646import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    4747import com.l2jserver.gameserver.model.actor.instance.L2TrapInstance; 
     48import com.l2jserver.gameserver.model.item.L2Item; 
    4849import com.l2jserver.gameserver.model.olympiad.CompetitionType; 
    4950import com.l2jserver.gameserver.model.zone.L2ZoneType; 
    … …  
    5455import com.l2jserver.gameserver.scripting.ScriptManager; 
    5556import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    56 import com.l2jserver.gameserver.templates.item.L2Item; 
    5757import com.l2jserver.gameserver.util.MinionList; 
    5858import com.l2jserver.util.Rnd; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/quest/QuestState.java

    r4994 r5083  
    3131import com.l2jserver.gameserver.instancemanager.QuestManager; 
    3232import com.l2jserver.gameserver.model.L2DropData; 
    33 import com.l2jserver.gameserver.model.L2ItemInstance; 
    3433import com.l2jserver.gameserver.model.actor.L2Character; 
    3534import com.l2jserver.gameserver.model.actor.L2Npc; 
    3635import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance; 
    3736import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     37import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3838import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
    3939import com.l2jserver.gameserver.network.SystemMessageId; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/L2ZoneForm.java

    r4771 r5083  
    1717import com.l2jserver.gameserver.idfactory.IdFactory; 
    1818import com.l2jserver.gameserver.instancemanager.ZoneManager; 
    19 import com.l2jserver.gameserver.model.L2ItemInstance; 
     19import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2020 
    2121/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/AbstractEnchantPacket.java

    r5051 r5083  
    2020 
    2121import com.l2jserver.Config; 
    22 import com.l2jserver.gameserver.model.L2ItemInstance; 
    23 import com.l2jserver.gameserver.templates.item.L2Item; 
     22import com.l2jserver.gameserver.model.item.L2Item; 
     23import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2424 
    2525 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/AbstractRefinePacket.java

    r4529 r5083  
    2121 
    2222import com.l2jserver.Config; 
    23 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2423import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     24import com.l2jserver.gameserver.model.item.L2Armor; 
     25import com.l2jserver.gameserver.model.item.L2Item; 
     26import com.l2jserver.gameserver.model.item.L2Weapon; 
     27import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2528import com.l2jserver.gameserver.network.SystemMessageId; 
    2629import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    27 import com.l2jserver.gameserver.templates.item.L2Armor; 
    28 import com.l2jserver.gameserver.templates.item.L2Item; 
    29 import com.l2jserver.gameserver.templates.item.L2Weapon; 
    3030 
    3131 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/CharacterCreate.java

    r5010 r5083  
    2929import com.l2jserver.gameserver.idfactory.IdFactory; 
    3030import com.l2jserver.gameserver.instancemanager.QuestManager; 
    31 import com.l2jserver.gameserver.model.L2ItemInstance; 
    3231import com.l2jserver.gameserver.model.L2ShortCut; 
    3332import com.l2jserver.gameserver.model.L2SkillLearn; 
    … …  
    3534import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    3635import com.l2jserver.gameserver.model.actor.stat.PcStat; 
     36import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3737import com.l2jserver.gameserver.model.quest.Quest; 
    3838import com.l2jserver.gameserver.model.quest.QuestState; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java

    r5076 r5083  
    4545import com.l2jserver.gameserver.instancemanager.TerritoryWarManager; 
    4646import com.l2jserver.gameserver.model.L2Clan; 
    47 import com.l2jserver.gameserver.model.L2ItemInstance; 
    4847import com.l2jserver.gameserver.model.L2Object; 
    4948import com.l2jserver.gameserver.model.L2World; 
    … …  
    5958import com.l2jserver.gameserver.model.entity.clanhall.AuctionableHall; 
    6059import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall; 
     60import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    6161import com.l2jserver.gameserver.model.quest.Quest; 
    6262import com.l2jserver.gameserver.model.quest.QuestState; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/MoveToLocationInAirShip.java

    r4733 r5083  
    1818import com.l2jserver.gameserver.model.actor.instance.L2AirShipInstance; 
    1919import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     20import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
    2021import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    2122import com.l2jserver.gameserver.network.serverpackets.ExMoveToLocationInAirShip; 
    2223import com.l2jserver.gameserver.network.serverpackets.StopMoveInVehicle; 
    23 import com.l2jserver.gameserver.templates.item.L2WeaponType; 
    2424import com.l2jserver.gameserver.util.Point3D; 
    2525 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/MultiSellChoose.java

    r4903 r5083  
    2424import com.l2jserver.gameserver.model.Elementals; 
    2525import com.l2jserver.gameserver.model.L2Augmentation; 
    26 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2726import com.l2jserver.gameserver.model.actor.L2Npc; 
    2827import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     28import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2929import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
    3030import com.l2jserver.gameserver.model.multisell.Entry; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java

    r5014 r5083  
    2222import com.l2jserver.gameserver.instancemanager.QuestManager; 
    2323import com.l2jserver.gameserver.model.L2Clan; 
    24 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2524import com.l2jserver.gameserver.model.L2Skill; 
    2625import com.l2jserver.gameserver.model.L2SkillLearn; 
    … …  
    3332import com.l2jserver.gameserver.model.actor.instance.L2TransformManagerInstance; 
    3433import com.l2jserver.gameserver.model.actor.instance.L2VillageMasterInstance; 
     34import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3535import com.l2jserver.gameserver.model.quest.Quest; 
    3636import com.l2jserver.gameserver.model.quest.QuestState; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestAutoSoulShot.java

    r4845 r5083  
    1818 
    1919import com.l2jserver.Config; 
    20 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2120import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     21import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2222import com.l2jserver.gameserver.network.SystemMessageId; 
    2323import com.l2jserver.gameserver.network.serverpackets.ExAutoSoulShot; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestBuyItem.java

    r4845 r5083  
    3131import com.l2jserver.gameserver.model.actor.instance.L2MerchantSummonInstance; 
    3232import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     33import com.l2jserver.gameserver.model.item.L2Item; 
    3334import com.l2jserver.gameserver.network.SystemMessageId; 
    3435import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    … …  
    3637import com.l2jserver.gameserver.network.serverpackets.StatusUpdate; 
    3738import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    38 import com.l2jserver.gameserver.templates.item.L2Item; 
    3939import com.l2jserver.gameserver.util.Util; 
    4040 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestBuySeed.java

    r4921 r5083  
    2727import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2828import com.l2jserver.gameserver.model.entity.Castle; 
     29import com.l2jserver.gameserver.model.item.L2Item; 
    2930import com.l2jserver.gameserver.network.SystemMessageId; 
    3031import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    3132import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    32 import com.l2jserver.gameserver.templates.item.L2Item; 
    3333import com.l2jserver.gameserver.util.Util; 
    3434 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestCancelPostAttachment.java

    r4731 r5083  
    1919import com.l2jserver.Config; 
    2020import com.l2jserver.gameserver.instancemanager.MailManager; 
    21 import com.l2jserver.gameserver.model.L2ItemInstance; 
    22 import com.l2jserver.gameserver.model.L2ItemInstance.ItemLocation; 
    2321import com.l2jserver.gameserver.model.L2World; 
    2422import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2523import com.l2jserver.gameserver.model.entity.Message; 
     24import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     25import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
    2626import com.l2jserver.gameserver.model.itemcontainer.ItemContainer; 
    2727import com.l2jserver.gameserver.network.SystemMessageId; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeNicknameColor.java

    r4733 r5083  
    1515package com.l2jserver.gameserver.network.clientpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.L2ItemInstance; 
    1817import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     18import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmCancelItem.java

    r4921 r5083  
    1616 
    1717import com.l2jserver.Config; 
    18 import com.l2jserver.gameserver.model.L2ItemInstance; 
    1918import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     19import com.l2jserver.gameserver.model.item.L2Item; 
     20import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2021import com.l2jserver.gameserver.network.SystemMessageId; 
    2122import com.l2jserver.gameserver.network.serverpackets.ExPutItemResultForVariationCancel; 
    2223import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    23 import com.l2jserver.gameserver.templates.item.L2Item; 
    2424import com.l2jserver.gameserver.util.Util; 
    2525 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmGemStone.java

    r4733 r5083  
    1515package com.l2jserver.gameserver.network.clientpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.L2ItemInstance; 
    1817import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     18import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    1919import com.l2jserver.gameserver.network.SystemMessageId; 
    2020import com.l2jserver.gameserver.network.serverpackets.ExPutCommissionResultForVariationMake; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmRefinerItem.java

    r4921 r5083  
    1515package com.l2jserver.gameserver.network.clientpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.L2ItemInstance; 
    1817import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     18import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    1919import com.l2jserver.gameserver.network.SystemMessageId; 
    2020import com.l2jserver.gameserver.network.serverpackets.ExPutIntensiveResultForVariationMake; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmTargetItem.java

    r4733 r5083  
    1515package com.l2jserver.gameserver.network.clientpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.L2ItemInstance; 
    1817import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     18import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    1919import com.l2jserver.gameserver.network.SystemMessageId; 
    2020import com.l2jserver.gameserver.network.serverpackets.ExPutItemResultForVariationMake; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestCrystallizeItem.java

    r4845 r5083  
    1818 
    1919import com.l2jserver.Config; 
    20 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2120import com.l2jserver.gameserver.model.L2Skill; 
    2221import com.l2jserver.gameserver.model.L2World; 
    2322import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2423import com.l2jserver.gameserver.model.base.Race; 
     24import com.l2jserver.gameserver.model.item.L2Item; 
     25import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2526import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
    2627import com.l2jserver.gameserver.network.SystemMessageId; 
    … …  
    2829import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 
    2930import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    30 import com.l2jserver.gameserver.templates.item.L2Item; 
    3131import com.l2jserver.gameserver.util.Util; 
    3232 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestDestroyItem.java

    r5049 r5083  
    2424import com.l2jserver.gameserver.datatables.PetDataTable; 
    2525import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager; 
    26 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2726import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     27import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2828import com.l2jserver.gameserver.network.SystemMessageId; 
    2929import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestDropItem.java

    r4994 r5083  
    1919import com.l2jserver.Config; 
    2020import com.l2jserver.gameserver.GmListTable; 
    21 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2221import com.l2jserver.gameserver.model.actor.L2Character; 
    2322import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     23import com.l2jserver.gameserver.model.item.L2Item; 
     24import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     25import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
    2426import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
    2527import com.l2jserver.gameserver.network.SystemMessageId; 
    2628import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 
    2729import com.l2jserver.gameserver.network.serverpackets.ItemList; 
    28 import com.l2jserver.gameserver.templates.item.L2EtcItemType; 
    29 import com.l2jserver.gameserver.templates.item.L2Item; 
    3030import com.l2jserver.gameserver.util.GMAudit; 
    3131import com.l2jserver.gameserver.util.Util; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestEnchantItem.java

    r5005 r5083  
    2121import com.l2jserver.Config; 
    2222import com.l2jserver.gameserver.datatables.SkillTable; 
    23 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2423import com.l2jserver.gameserver.model.L2Skill; 
    2524import com.l2jserver.gameserver.model.L2World; 
    2625import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     26import com.l2jserver.gameserver.model.item.L2Armor; 
     27import com.l2jserver.gameserver.model.item.L2Item; 
     28import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2729import com.l2jserver.gameserver.network.SystemMessageId; 
    2830import com.l2jserver.gameserver.network.serverpackets.EnchantResult; 
    … …  
    3234import com.l2jserver.gameserver.network.serverpackets.StatusUpdate; 
    3335import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    34 import com.l2jserver.gameserver.templates.item.L2Armor; 
    35 import com.l2jserver.gameserver.templates.item.L2Item; 
    3636import com.l2jserver.gameserver.util.Util; 
    3737import com.l2jserver.util.Rnd; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java

    r5008 r5083  
    1717import com.l2jserver.Config; 
    1818import com.l2jserver.gameserver.model.Elementals; 
    19 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2019import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     20import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2121import com.l2jserver.gameserver.network.SystemMessageId; 
    2222import com.l2jserver.gameserver.network.serverpackets.ExAttributeEnchantResult; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkill.java

    r5017 r5083  
    2424import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillDetail; 
    2525import com.l2jserver.gameserver.model.L2EnchantSkillLearn; 
    26 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2726import com.l2jserver.gameserver.model.L2Skill; 
    2827import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     28import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2929import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
    3030import com.l2jserver.gameserver.network.SystemMessageId; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java

    r5017 r5083  
    2424import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillDetail; 
    2525import com.l2jserver.gameserver.model.L2EnchantSkillLearn; 
    26 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2726import com.l2jserver.gameserver.model.L2Skill; 
    2827import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     28import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2929import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
    3030import com.l2jserver.gameserver.network.SystemMessageId; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java

    r5017 r5083  
    2424import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillDetail; 
    2525import com.l2jserver.gameserver.model.L2EnchantSkillLearn; 
    26 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2726import com.l2jserver.gameserver.model.L2Skill; 
    2827import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     28import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2929import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
    3030import com.l2jserver.gameserver.network.SystemMessageId; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java

    r5017 r5083  
    2424import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillDetail; 
    2525import com.l2jserver.gameserver.model.L2EnchantSkillLearn; 
    26 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2726import com.l2jserver.gameserver.model.L2Skill; 
    2827import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     28import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2929import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
    3030import com.l2jserver.gameserver.network.SystemMessageId; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java

    r4884 r5083  
    1616 
    1717import com.l2jserver.gameserver.model.Elementals; 
    18 import com.l2jserver.gameserver.model.L2ItemInstance; 
    1918import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     19import com.l2jserver.gameserver.model.item.L2Item; 
     20import com.l2jserver.gameserver.model.item.L2Weapon; 
     21import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2022import com.l2jserver.gameserver.network.SystemMessageId; 
    2123import com.l2jserver.gameserver.network.serverpackets.ExBaseAttributeCancelResult; 
    … …  
    2325import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    2426import com.l2jserver.gameserver.network.serverpackets.UserInfo; 
    25 import com.l2jserver.gameserver.templates.item.L2Item; 
    26 import com.l2jserver.gameserver.templates.item.L2Weapon; 
    2727 
    2828public class RequestExRemoveItemAttribute extends L2GameClientPacket 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExRqItemLink.java

    r4733 r5083  
    1818 
    1919import com.l2jserver.Config; 
    20 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2120import com.l2jserver.gameserver.model.L2Object; 
    2221import com.l2jserver.gameserver.model.L2World; 
     22import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2323import com.l2jserver.gameserver.network.L2GameClient; 
    2424import com.l2jserver.gameserver.network.serverpackets.ExRpItemLink; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java

    r4733 r5083  
    1515package com.l2jserver.gameserver.network.clientpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.L2ItemInstance; 
    1817import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     18import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    1919import com.l2jserver.gameserver.network.SystemMessageId; 
    2020import com.l2jserver.gameserver.network.serverpackets.ExPutEnchantSupportItemResult; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java

    r5005 r5083  
    1515package com.l2jserver.gameserver.network.clientpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.L2ItemInstance; 
    1817import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     18import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    1919import com.l2jserver.gameserver.network.SystemMessageId; 
    2020import com.l2jserver.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestGiveItemToPet.java

    r4845 r5083  
    1818 
    1919import com.l2jserver.Config; 
    20 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2120import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2221import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
     22import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2323import com.l2jserver.gameserver.network.SystemMessageId; 
    2424 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaDrawList.java

    r4733 r5083  
    1616 
    1717import com.l2jserver.gameserver.datatables.HennaTreeTable; 
    18 import com.l2jserver.gameserver.model.L2HennaInstance; 
    1918import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     19import com.l2jserver.gameserver.model.item.instance.L2HennaInstance; 
    2020import com.l2jserver.gameserver.network.serverpackets.HennaEquipList; 
    2121 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaEquip.java

    r4733 r5083  
    1818import com.l2jserver.gameserver.datatables.HennaTable; 
    1919import com.l2jserver.gameserver.datatables.HennaTreeTable; 
    20 import com.l2jserver.gameserver.model.L2HennaInstance; 
    2120import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     21import com.l2jserver.gameserver.model.item.L2Henna; 
     22import com.l2jserver.gameserver.model.item.instance.L2HennaInstance; 
    2223import com.l2jserver.gameserver.network.SystemMessageId; 
    2324import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 
    2425import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    25 import com.l2jserver.gameserver.templates.item.L2Henna; 
    2626import com.l2jserver.gameserver.util.Util; 
    2727 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaItemDrawInfo.java

    r4733 r5083  
    1616 
    1717import com.l2jserver.gameserver.datatables.HennaTable; 
    18 import com.l2jserver.gameserver.model.L2HennaInstance; 
    1918import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     19import com.l2jserver.gameserver.model.item.L2Henna; 
     20import com.l2jserver.gameserver.model.item.instance.L2HennaInstance; 
    2021import com.l2jserver.gameserver.network.serverpackets.HennaItemDrawInfo; 
    21 import com.l2jserver.gameserver.templates.item.L2Henna; 
    2222 
    2323/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java

    r4733 r5083  
    1616 
    1717import com.l2jserver.gameserver.datatables.HennaTable; 
    18 import com.l2jserver.gameserver.model.L2HennaInstance; 
    1918import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     19import com.l2jserver.gameserver.model.item.L2Henna; 
     20import com.l2jserver.gameserver.model.item.instance.L2HennaInstance; 
    2021import com.l2jserver.gameserver.network.serverpackets.HennaItemRemoveInfo; 
    21 import com.l2jserver.gameserver.templates.item.L2Henna; 
    2222 
    2323 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaRemove.java

    r4884 r5083  
    1515package com.l2jserver.gameserver.network.clientpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.L2HennaInstance; 
    1817import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     18import com.l2jserver.gameserver.model.item.instance.L2HennaInstance; 
    1919import com.l2jserver.gameserver.network.SystemMessageId; 
    2020 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java

    r4995 r5083  
    2020import com.l2jserver.gameserver.model.actor.instance.L2BoatInstance; 
    2121import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     22import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
    2223import com.l2jserver.gameserver.network.SystemMessageId; 
    2324import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    … …  
    2526import com.l2jserver.gameserver.network.serverpackets.StopMoveInVehicle; 
    2627import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    27 import com.l2jserver.gameserver.templates.item.L2WeaponType; 
    2828import com.l2jserver.gameserver.util.Point3D; 
    2929 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestPackageSend.java

    r5038 r5083  
    1919import com.l2jserver.Config; 
    2020import com.l2jserver.gameserver.model.ItemHolder; 
    21 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2221import com.l2jserver.gameserver.model.actor.L2Npc; 
    2322import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance; 
    2423import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     24import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2525import com.l2jserver.gameserver.model.itemcontainer.ItemContainer; 
    2626import com.l2jserver.gameserver.model.itemcontainer.PcFreight; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestPackageSendableItemList.java

    r4733 r5083  
    1515package com.l2jserver.gameserver.network.clientpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.L2ItemInstance; 
     17import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    1818import com.l2jserver.gameserver.network.serverpackets.PackageSendableList; 
    1919 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestPetGetItem.java

    r4733 r5083  
    1818import com.l2jserver.gameserver.instancemanager.FortSiegeManager; 
    1919import com.l2jserver.gameserver.instancemanager.MercTicketManager; 
    20 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2120import com.l2jserver.gameserver.model.L2World; 
    2221import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
    2322import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance; 
     23import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2424import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    2525 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestPetUseItem.java

    r5080 r5083  
    2121import com.l2jserver.gameserver.handler.IItemHandler; 
    2222import com.l2jserver.gameserver.handler.ItemHandler; 
    23 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2423import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2524import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
     25import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2626import com.l2jserver.gameserver.network.SystemMessageId; 
    2727import com.l2jserver.gameserver.network.serverpackets.PetItemList; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestPostAttachment.java

    r4455 r5083  
    2121import com.l2jserver.gameserver.datatables.ItemTable; 
    2222import com.l2jserver.gameserver.instancemanager.MailManager; 
    23 import com.l2jserver.gameserver.model.L2ItemInstance; 
    24 import com.l2jserver.gameserver.model.L2ItemInstance.ItemLocation; 
    2523import com.l2jserver.gameserver.model.L2World; 
    2624import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2725import com.l2jserver.gameserver.model.entity.Message; 
     26import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     27import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
    2828import com.l2jserver.gameserver.model.itemcontainer.ItemContainer; 
    2929import com.l2jserver.gameserver.network.SystemMessageId; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestPreviewItem.java

    r4981 r5083  
    3232import com.l2jserver.gameserver.model.actor.instance.L2MerchantInstance; 
    3333import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     34import com.l2jserver.gameserver.model.item.L2Armor; 
     35import com.l2jserver.gameserver.model.item.L2Item; 
     36import com.l2jserver.gameserver.model.item.L2Weapon; 
     37import com.l2jserver.gameserver.model.item.type.L2ArmorType; 
     38import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
    3439import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
    3540import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
    … …  
    3843import com.l2jserver.gameserver.network.serverpackets.ShopPreviewInfo; 
    3944import com.l2jserver.gameserver.network.serverpackets.UserInfo; 
    40 import com.l2jserver.gameserver.templates.item.L2Armor; 
    41 import com.l2jserver.gameserver.templates.item.L2ArmorType; 
    42 import com.l2jserver.gameserver.templates.item.L2Item; 
    43 import com.l2jserver.gameserver.templates.item.L2Weapon; 
    44 import com.l2jserver.gameserver.templates.item.L2WeaponType; 
    4545import com.l2jserver.gameserver.util.Util; 
    4646 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestProcureCropList.java

    r4733 r5083  
    2323import com.l2jserver.gameserver.instancemanager.CastleManorManager; 
    2424import com.l2jserver.gameserver.instancemanager.CastleManorManager.CropProcure; 
    25 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2625import com.l2jserver.gameserver.model.L2Manor; 
    2726import com.l2jserver.gameserver.model.L2Object; 
    2827import com.l2jserver.gameserver.model.actor.instance.L2ManorManagerInstance; 
    2928import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     29import com.l2jserver.gameserver.model.item.L2Item; 
     30import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3031import com.l2jserver.gameserver.network.SystemMessageId; 
    3132import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    32 import com.l2jserver.gameserver.templates.item.L2Item; 
    3333 
    3434/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestRefine.java

    r4733 r5083  
    1717import com.l2jserver.gameserver.datatables.AugmentationData; 
    1818import com.l2jserver.gameserver.model.L2Augmentation; 
    19 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2019import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     20import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2121import com.l2jserver.gameserver.network.SystemMessageId; 
    2222import com.l2jserver.gameserver.network.serverpackets.ExVariationResult; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestRefineCancel.java

    r4733 r5083  
    1616 
    1717import com.l2jserver.Config; 
    18 import com.l2jserver.gameserver.model.L2ItemInstance; 
    1918import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     19import com.l2jserver.gameserver.model.item.L2Item; 
     20import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2021import com.l2jserver.gameserver.network.SystemMessageId; 
    2122import com.l2jserver.gameserver.network.serverpackets.ExVariationCancelResult; 
    2223import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 
    2324import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    24 import com.l2jserver.gameserver.templates.item.L2Item; 
    2525import com.l2jserver.gameserver.util.Util; 
    2626 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestRefundItem.java

    r4845 r5083  
    2222import com.l2jserver.Config; 
    2323import com.l2jserver.gameserver.TradeController; 
    24 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2524import com.l2jserver.gameserver.model.L2Object; 
    2625import com.l2jserver.gameserver.model.L2TradeList; 
    … …  
    2928import com.l2jserver.gameserver.model.actor.instance.L2MerchantSummonInstance; 
    3029import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     30import com.l2jserver.gameserver.model.item.L2Item; 
     31import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3132import com.l2jserver.gameserver.network.SystemMessageId; 
    3233import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    3334import com.l2jserver.gameserver.network.serverpackets.ExBuySellListPacket; 
    3435import com.l2jserver.gameserver.network.serverpackets.StatusUpdate; 
    35 import com.l2jserver.gameserver.templates.item.L2Item; 
    3636import com.l2jserver.gameserver.util.Util; 
    3737 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestSaveInventoryOrder.java

    r4733 r5083  
    1818import java.util.List; 
    1919 
    20 import com.l2jserver.gameserver.model.L2ItemInstance; 
    21 import com.l2jserver.gameserver.model.L2ItemInstance.ItemLocation; 
    2220import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     21import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     22import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
    2323import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
    2424 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestSellItem.java

    r4845 r5083  
    2222import com.l2jserver.Config; 
    2323import com.l2jserver.gameserver.TradeController; 
    24 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2524import com.l2jserver.gameserver.model.L2Object; 
    2625import com.l2jserver.gameserver.model.L2TradeList; 
    … …  
    2928import com.l2jserver.gameserver.model.actor.instance.L2MerchantSummonInstance; 
    3029import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     30import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3131import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    3232import com.l2jserver.gameserver.network.serverpackets.ExBuySellListPacket; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestSendPost.java

    r4845 r5083  
    2727import com.l2jserver.gameserver.model.BlockList; 
    2828import com.l2jserver.gameserver.model.L2AccessLevel; 
    29 import com.l2jserver.gameserver.model.L2ItemInstance; 
    3029import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    3130import com.l2jserver.gameserver.model.entity.Message; 
     31import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3232import com.l2jserver.gameserver.model.itemcontainer.Mail; 
    3333import com.l2jserver.gameserver.network.SystemMessageId; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestUnEquipItem.java

    r5062 r5083  
    1818 
    1919import com.l2jserver.Config; 
    20 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2120import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     21import com.l2jserver.gameserver.model.item.L2EtcItem; 
     22import com.l2jserver.gameserver.model.item.L2Item; 
     23import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2224import com.l2jserver.gameserver.network.SystemMessageId; 
    2325import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 
    2426import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    25 import com.l2jserver.gameserver.templates.item.L2EtcItem; 
    26 import com.l2jserver.gameserver.templates.item.L2Item; 
    2727 
    2828/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/Say2.java

    r5080 r5083  
    2222import com.l2jserver.gameserver.handler.ChatHandler; 
    2323import com.l2jserver.gameserver.handler.IChatHandler; 
    24 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2524import com.l2jserver.gameserver.model.L2Object; 
    2625import com.l2jserver.gameserver.model.L2World; 
    2726import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     27import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2828import com.l2jserver.gameserver.network.SystemMessageId; 
    2929import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/SendWareHouseDepositList.java

    r4845 r5083  
    2020 
    2121import com.l2jserver.Config; 
    22 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2322import com.l2jserver.gameserver.model.actor.L2Npc; 
    2423import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     24import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2525import com.l2jserver.gameserver.model.itemcontainer.ItemContainer; 
    2626import com.l2jserver.gameserver.model.itemcontainer.PcWarehouse; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/SendWareHouseWithDrawList.java

    r5038 r5083  
    1919import com.l2jserver.gameserver.model.ItemHolder; 
    2020import com.l2jserver.gameserver.model.L2Clan; 
    21 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2221import com.l2jserver.gameserver.model.actor.L2Npc; 
    2322import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     23import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2424import com.l2jserver.gameserver.model.itemcontainer.ItemContainer; 
    2525import com.l2jserver.gameserver.model.itemcontainer.PcWarehouse; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/UseItem.java

    r5080 r5083  
    2828import com.l2jserver.gameserver.handler.ItemHandler; 
    2929import com.l2jserver.gameserver.instancemanager.FortSiegeManager; 
    30 import com.l2jserver.gameserver.model.L2ItemInstance; 
    3130import com.l2jserver.gameserver.model.L2Skill; 
    3231import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    3332import com.l2jserver.gameserver.model.base.Race; 
     33import com.l2jserver.gameserver.model.item.L2Item; 
     34import com.l2jserver.gameserver.model.item.L2Weapon; 
     35import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     36import com.l2jserver.gameserver.model.item.type.L2ArmorType; 
     37import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
    3438import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
    3539import com.l2jserver.gameserver.network.SystemMessageId; 
    … …  
    3943import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    4044import com.l2jserver.gameserver.skills.SkillHolder; 
    41 import com.l2jserver.gameserver.templates.item.L2ArmorType; 
    42 import com.l2jserver.gameserver.templates.item.L2Item; 
    43 import com.l2jserver.gameserver.templates.item.L2Weapon; 
    44 import com.l2jserver.gameserver.templates.item.L2WeaponType; 
    4545import com.l2jserver.gameserver.templates.skills.L2SkillType; 
    4646 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/communityserver/readpackets/RequestWorldInfo.java

    r4417 r5083  
    2727import com.l2jserver.gameserver.model.L2Clan; 
    2828import com.l2jserver.gameserver.model.L2World; 
     29import com.l2jserver.gameserver.model.StatsSet; 
    2930import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    3031import com.l2jserver.gameserver.network.communityserver.CommunityServerThread; 
    3132import com.l2jserver.gameserver.network.communityserver.writepackets.InitWorldInfo; 
    3233import com.l2jserver.gameserver.network.communityserver.writepackets.WorldInfo; 
    33 import com.l2jserver.gameserver.templates.StatsSet; 
    3434 
    3535/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/communityserver/writepackets/InitWorldInfo.java

    r4997 r5083  
    3030import com.l2jserver.gameserver.instancemanager.CastleManager; 
    3131import com.l2jserver.gameserver.model.L2Clan; 
     32import com.l2jserver.gameserver.model.StatsSet; 
    3233import com.l2jserver.gameserver.model.entity.Castle; 
    33 import com.l2jserver.gameserver.templates.StatsSet; 
    3434 
    3535/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ConfirmDlg.java

    r5013 r5083  
    1818 
    1919import com.l2jserver.gameserver.model.L2Effect; 
    20 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2120import com.l2jserver.gameserver.model.L2Skill; 
    2221import com.l2jserver.gameserver.model.actor.L2Character; 
    … …  
    2423import com.l2jserver.gameserver.model.actor.L2Summon; 
    2524import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     25import com.l2jserver.gameserver.model.item.L2Item; 
     26import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2627import com.l2jserver.gameserver.network.SystemMessageId; 
    2728import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    28 import com.l2jserver.gameserver.templates.item.L2Item; 
    2929 
    3030/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/DropItem.java

    r4417 r5083  
    1515package com.l2jserver.gameserver.network.serverpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.L2ItemInstance; 
     17import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/EquipUpdate.java

    r4417 r5083  
    1818 
    1919import com.l2jserver.Config; 
    20 import com.l2jserver.gameserver.model.L2ItemInstance; 
    21 import com.l2jserver.gameserver.templates.item.L2Item; 
     20import com.l2jserver.gameserver.model.item.L2Item; 
     21import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2222 
    2323 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExBuySellListPacket.java

    r4622 r5083  
    1919import javolution.util.FastList; 
    2020 
    21 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2221import com.l2jserver.gameserver.model.L2TradeList; 
    2322import com.l2jserver.gameserver.model.L2TradeList.L2TradeItem; 
    2423import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     24import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2525 
    2626/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java

    r4417 r5083  
    1616 
    1717import com.l2jserver.gameserver.model.Elementals; 
    18 import com.l2jserver.gameserver.model.L2ItemInstance; 
     18import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    1919 
    2020 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExHeroList.java

    r4417 r5083  
    1717import java.util.Map; 
    1818 
     19import com.l2jserver.gameserver.model.StatsSet; 
    1920import com.l2jserver.gameserver.model.entity.Hero; 
    2021import com.l2jserver.gameserver.model.olympiad.Olympiad; 
    21 import com.l2jserver.gameserver.templates.StatsSet; 
    2222 
    2323 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java

    r4921 r5083  
    1515package com.l2jserver.gameserver.network.serverpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.L2ItemInstance; 
     17import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExQuestItemList.java

    r4568 r5083  
    1717import javolution.util.FastList; 
    1818 
    19 import com.l2jserver.gameserver.model.L2ItemInstance; 
     19import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2020import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
    2121 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExReplyPostItemList.java

    r4622 r5083  
    1515package com.l2jserver.gameserver.network.serverpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.L2ItemInstance; 
    1817import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     18import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExReplyReceivedPost.java

    r4890 r5083  
    1717import java.util.logging.Logger; 
    1818 
    19 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2019import com.l2jserver.gameserver.model.entity.Message; 
     20import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2121import com.l2jserver.gameserver.model.itemcontainer.ItemContainer; 
    2222 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExReplySentPost.java

    r4890 r5083  
    1717import java.util.logging.Logger; 
    1818 
    19 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2019import com.l2jserver.gameserver.model.entity.Message; 
     20import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2121import com.l2jserver.gameserver.model.itemcontainer.ItemContainer; 
    2222 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExRpItemLink.java

    r4417 r5083  
    1515package com.l2jserver.gameserver.network.serverpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.L2ItemInstance; 
     17import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java

    r4417 r5083  
    1515package com.l2jserver.gameserver.network.serverpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.L2ItemInstance; 
    1817import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    19 import com.l2jserver.gameserver.templates.item.L2Item; 
    20 import com.l2jserver.gameserver.templates.item.L2Weapon; 
     18import com.l2jserver.gameserver.model.item.L2Item; 
     19import com.l2jserver.gameserver.model.item.L2Weapon; 
     20import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2121 
    2222public class ExShowBaseAttributeCancelWindow extends L2GameServerPacket 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExShowSellCropList.java

    r4417 r5083  
    2222 
    2323import com.l2jserver.gameserver.instancemanager.CastleManorManager.CropProcure; 
    24 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2524import com.l2jserver.gameserver.model.L2Manor; 
    2625import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     26import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2727 
    2828/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/GMHennaInfo.java

    r4426 r5083  
    1515package com.l2jserver.gameserver.network.serverpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.L2HennaInstance; 
    1817import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     18import com.l2jserver.gameserver.model.item.instance.L2HennaInstance; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/GMViewItemList.java

    r4417 r5083  
    1515package com.l2jserver.gameserver.network.serverpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.L2ItemInstance; 
    1817import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    1918import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
     19import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2020 
    2121/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java

    r4417 r5083  
    1616 
    1717import com.l2jserver.gameserver.model.L2Clan; 
    18 import com.l2jserver.gameserver.model.L2ItemInstance; 
    1918import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     19import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2020 
    2121/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/GetItem.java

    r4417 r5083  
    1515package com.l2jserver.gameserver.network.serverpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.L2ItemInstance; 
     17import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    1818 
    1919/** 
    … …  
    4949        } 
    5050         
    51         /* (non-Javadoc) 
    52          * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#getType() 
    53          */ 
    5451        @Override 
    5552        public String getType() 
    … …  
    5754                return _S__17_GETITEM; 
    5855        } 
    59          
    6056} 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/HennaEquipList.java

    r4417 r5083  
    1515package com.l2jserver.gameserver.network.serverpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.L2HennaInstance; 
    1817import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     18import com.l2jserver.gameserver.model.item.instance.L2HennaInstance; 
    1919 
    2020public class HennaEquipList extends L2GameServerPacket 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/HennaInfo.java

    r4426 r5083  
    1515package com.l2jserver.gameserver.network.serverpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.L2HennaInstance; 
    1817import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     18import com.l2jserver.gameserver.model.item.instance.L2HennaInstance; 
    1919 
    2020public final class HennaInfo extends L2GameServerPacket 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/HennaItemDrawInfo.java

    r4417 r5083  
    1515package com.l2jserver.gameserver.network.serverpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.L2HennaInstance; 
    1817import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     18import com.l2jserver.gameserver.model.item.instance.L2HennaInstance; 
    1919 
    2020public class HennaItemDrawInfo extends L2GameServerPacket 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/HennaItemRemoveInfo.java

    r4417 r5083  
    1515package com.l2jserver.gameserver.network.serverpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.L2HennaInstance; 
    1817import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     18import com.l2jserver.gameserver.model.item.instance.L2HennaInstance; 
    1919 
    2020public class HennaItemRemoveInfo extends L2GameServerPacket 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/HennaRemoveList.java

    r4417 r5083  
    1515package com.l2jserver.gameserver.network.serverpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.L2HennaInstance; 
    1817import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     18import com.l2jserver.gameserver.model.item.instance.L2HennaInstance; 
    1919 
    2020public class HennaRemoveList extends L2GameServerPacket 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/InventoryUpdate.java

    r4417 r5083  
    2222import com.l2jserver.Config; 
    2323import com.l2jserver.gameserver.model.ItemInfo; 
    24 import com.l2jserver.gameserver.model.L2ItemInstance; 
     24import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2525 
    2626/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ItemList.java

    r4417 r5083  
    1919import javolution.util.FastList; 
    2020 
    21 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2221import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     22import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2323import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
    2424 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PackageSendableList.java

    r4622 r5083  
    1515package com.l2jserver.gameserver.network.serverpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.L2ItemInstance; 
    1817import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     18import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PetInventoryUpdate.java

    r4417 r5083  
    2222import com.l2jserver.Config; 
    2323import com.l2jserver.gameserver.model.ItemInfo; 
    24 import com.l2jserver.gameserver.model.L2ItemInstance; 
     24import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2525 
    2626/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PetItemList.java

    r4417 r5083  
    1818 
    1919import com.l2jserver.Config; 
    20 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2120import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
     21import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2222 
    2323 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PrivateStoreManageListBuy.java

    r4997 r5083  
    1515package com.l2jserver.gameserver.network.serverpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.L2ItemInstance; 
    1817import com.l2jserver.gameserver.model.TradeItem; 
    1918import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     19import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2020 
    2121/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/SSQStatus.java

    r4884 r5083  
    2020import com.l2jserver.gameserver.SevenSigns; 
    2121import com.l2jserver.gameserver.SevenSignsFestival; 
     22import com.l2jserver.gameserver.model.StatsSet; 
    2223import com.l2jserver.gameserver.network.SystemMessageId; 
    23 import com.l2jserver.gameserver.templates.StatsSet; 
    2424 
    2525 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/SellList.java

    r5013 r5083  
    2121 
    2222import com.l2jserver.Config; 
    23 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2423import com.l2jserver.gameserver.model.actor.instance.L2MerchantInstance; 
    2524import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     25import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2626 
    2727/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/SellListProcure.java

    r4417 r5083  
    2323import com.l2jserver.gameserver.instancemanager.CastleManager; 
    2424import com.l2jserver.gameserver.instancemanager.CastleManorManager.CropProcure; 
    25 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2625import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     26import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2727 
    2828public class SellListProcure extends L2GameServerPacket 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ShopPreviewList.java

    r4417 r5083  
    2020import com.l2jserver.gameserver.model.L2TradeList; 
    2121import com.l2jserver.gameserver.model.L2TradeList.L2TradeItem; 
    22 import com.l2jserver.gameserver.templates.item.L2Item; 
     22import com.l2jserver.gameserver.model.item.L2Item; 
    2323 
    2424 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java

    r4981 r5083  
    2323 
    2424import com.l2jserver.gameserver.RecipeController; 
    25 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2625import com.l2jserver.gameserver.model.L2RecipeList; 
    2726import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    28 import com.l2jserver.gameserver.templates.item.L2EtcItemType; 
    29 import com.l2jserver.gameserver.templates.item.L2Item; 
    30 import com.l2jserver.gameserver.templates.item.L2WarehouseItem; 
     27import com.l2jserver.gameserver.model.item.L2Item; 
     28import com.l2jserver.gameserver.model.item.L2WarehouseItem; 
     29import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     30import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
    3131 
    3232/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/SpawnItem.java

    r4417 r5083  
    1515package com.l2jserver.gameserver.network.serverpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.L2ItemInstance; 
    1817import com.l2jserver.gameserver.model.L2Object; 
     18import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/SystemMessage.java

    r5013 r5083  
    2727import com.l2jserver.gameserver.model.Elementals; 
    2828import com.l2jserver.gameserver.model.L2Effect; 
    29 import com.l2jserver.gameserver.model.L2ItemInstance; 
    3029import com.l2jserver.gameserver.model.L2Skill; 
    3130import com.l2jserver.gameserver.model.actor.L2Character; 
    … …  
    3433import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    3534import com.l2jserver.gameserver.model.entity.Castle; 
     35import com.l2jserver.gameserver.model.item.L2Item; 
     36import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3637import com.l2jserver.gameserver.network.SystemMessageId; 
    3738import com.l2jserver.gameserver.network.SystemMessageId.SMLocalisation; 
    3839import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    39 import com.l2jserver.gameserver.templates.item.L2Item; 
    4040 
    4141public final class SystemMessage extends L2GameServerPacket 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/TradeStart.java

    r4622 r5083  
    1616 
    1717import com.l2jserver.Config; 
    18 import com.l2jserver.gameserver.model.L2ItemInstance; 
    1918import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     19import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2020 
    2121/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/WareHouseDepositList.java

    r4622 r5083  
    2020 
    2121import com.l2jserver.Config; 
    22 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2322import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     23import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2424 
    2525/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/WareHouseWithdrawalList.java

    r4884 r5083  
    1818 
    1919import com.l2jserver.Config; 
    20 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2120import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     21import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2222 
    2323 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/pathfinding/cellnodes/CellPathFinding.java

    r4994 r5083  
    2626import com.l2jserver.gameserver.GeoData; 
    2727import com.l2jserver.gameserver.idfactory.IdFactory; 
    28 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2928import com.l2jserver.gameserver.model.L2World; 
     29import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3030import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
    3131import com.l2jserver.gameserver.pathfinding.AbstractNode; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/DocumentBase.java

    r5043 r5083  
    3737import com.l2jserver.gameserver.model.L2Object.InstanceType; 
    3838import com.l2jserver.gameserver.model.L2Skill; 
     39import com.l2jserver.gameserver.model.StatsSet; 
    3940import com.l2jserver.gameserver.model.base.PlayerState; 
    4041import com.l2jserver.gameserver.model.base.Race; 
     42import com.l2jserver.gameserver.model.item.L2Item; 
     43import com.l2jserver.gameserver.model.item.type.L2ArmorType; 
     44import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
    4145import com.l2jserver.gameserver.skills.conditions.Condition; 
    4246import com.l2jserver.gameserver.skills.conditions.ConditionChangeWeapon; 
    … …  
    110114import com.l2jserver.gameserver.skills.funcs.LambdaConst; 
    111115import com.l2jserver.gameserver.skills.funcs.LambdaStats; 
    112 import com.l2jserver.gameserver.templates.StatsSet; 
    113116import com.l2jserver.gameserver.templates.effects.EffectTemplate; 
    114 import com.l2jserver.gameserver.templates.item.L2ArmorType; 
    115 import com.l2jserver.gameserver.templates.item.L2Item; 
    116 import com.l2jserver.gameserver.templates.item.L2WeaponType; 
    117117import com.l2jserver.gameserver.templates.skills.L2SkillType; 
    118118 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/DocumentItem.java

    r4921 r5083  
    2727 
    2828import com.l2jserver.gameserver.Item; 
     29import com.l2jserver.gameserver.model.StatsSet; 
     30import com.l2jserver.gameserver.model.item.L2Item; 
    2931import com.l2jserver.gameserver.skills.conditions.Condition; 
    30 import com.l2jserver.gameserver.templates.StatsSet; 
    31 import com.l2jserver.gameserver.templates.item.L2Item; 
    3232 
    3333/** 
    … …  
    156156                try 
    157157                { 
    158                         Constructor<?> c = Class.forName("com.l2jserver.gameserver.templates.item.L2"+_currentItem.type).getConstructor(StatsSet.class); 
     158                        Constructor<?> c = Class.forName("com.l2jserver.gameserver.model.item.L2"+_currentItem.type).getConstructor(StatsSet.class); 
    159159                        _currentItem.item = (L2Item) c.newInstance(_currentItem.set); 
    160160                } 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/DocumentSkill.java

    r4513 r5083  
    2727import com.l2jserver.gameserver.datatables.EnchantGroupsTable; 
    2828import com.l2jserver.gameserver.model.L2Skill; 
     29import com.l2jserver.gameserver.model.StatsSet; 
    2930import com.l2jserver.gameserver.skills.conditions.Condition; 
    30 import com.l2jserver.gameserver.templates.StatsSet; 
    3131import com.l2jserver.gameserver.templates.skills.L2SkillType; 
    3232 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/Env.java

    r4417 r5083  
    1616 
    1717import com.l2jserver.gameserver.model.L2Effect; 
    18 import com.l2jserver.gameserver.model.L2ItemInstance; 
    1918import com.l2jserver.gameserver.model.L2Skill; 
    2019import com.l2jserver.gameserver.model.actor.L2Character; 
    2120import com.l2jserver.gameserver.model.actor.instance.L2CubicInstance; 
     21import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2222 
    2323/** 
    24  * 
    2524 * An Env object is just a class to pass parameters to a calculator such as L2PcInstance, L2ItemInstance, Initial value. 
    26  * 
    2725 */ 
    28  
    2926public final class Env { 
    3027         

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/Formulas.java

    r5077 r5083  
    2727import com.l2jserver.gameserver.instancemanager.ZoneManager; 
    2828import com.l2jserver.gameserver.model.Elementals; 
    29 import com.l2jserver.gameserver.model.L2ItemInstance; 
    3029import com.l2jserver.gameserver.model.L2SiegeClan; 
    3130import com.l2jserver.gameserver.model.L2Skill; 
    … …  
    4645import com.l2jserver.gameserver.model.entity.Fort; 
    4746import com.l2jserver.gameserver.model.entity.Siege; 
     47import com.l2jserver.gameserver.model.item.L2Armor; 
     48import com.l2jserver.gameserver.model.item.L2Item; 
     49import com.l2jserver.gameserver.model.item.L2Weapon; 
     50import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     51import com.l2jserver.gameserver.model.item.type.L2ArmorType; 
     52import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
    4853import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
    4954import com.l2jserver.gameserver.model.zone.type.L2CastleZone; 
    … …  
    5863import com.l2jserver.gameserver.templates.chars.L2PcTemplate; 
    5964import com.l2jserver.gameserver.templates.effects.EffectTemplate; 
    60 import com.l2jserver.gameserver.templates.item.L2Armor; 
    61 import com.l2jserver.gameserver.templates.item.L2ArmorType; 
    62 import com.l2jserver.gameserver.templates.item.L2Item; 
    63 import com.l2jserver.gameserver.templates.item.L2Weapon; 
    64 import com.l2jserver.gameserver.templates.item.L2WeaponType; 
    6565import com.l2jserver.gameserver.templates.skills.L2SkillType; 
    6666import com.l2jserver.gameserver.templates.skills.L2TraitType; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/SkillsEngine.java

    r4972 r5083  
    2626import com.l2jserver.gameserver.datatables.SkillTable; 
    2727import com.l2jserver.gameserver.model.L2Skill; 
    28 import com.l2jserver.gameserver.templates.item.L2Item; 
     28import com.l2jserver.gameserver.model.item.L2Item; 
    2929import com.l2jserver.util.file.filter.XMLFilter; 
    3030 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/conditions/ConditionChangeWeapon.java

    r4921 r5083  
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     18import com.l2jserver.gameserver.model.item.L2Weapon; 
    1819import com.l2jserver.gameserver.skills.Env; 
    19 import com.l2jserver.gameserver.templates.item.L2Weapon; 
    2020 
    2121/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/conditions/ConditionPetType.java

    r4921 r5083  
    1818import com.l2jserver.gameserver.model.actor.L2Summon; 
    1919import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
     20import com.l2jserver.gameserver.model.item.L2Item; 
    2021import com.l2jserver.gameserver.skills.Env; 
    21 import com.l2jserver.gameserver.templates.item.L2Item; 
    2222 
    2323/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/conditions/ConditionPlayerHasPet.java

    r4417 r5083  
    1717import java.util.ArrayList; 
    1818 
    19 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2019import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2120import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
     21import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2222import com.l2jserver.gameserver.skills.Env; 
    2323 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/conditions/ConditionSlotItemId.java

    r4149 r5083  
    1515package com.l2jserver.gameserver.skills.conditions; 
    1616 
    17 import com.l2jserver.gameserver.model.L2ItemInstance; 
    1817import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     18import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    1919import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
    2020import com.l2jserver.gameserver.skills.Env; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/conditions/ConditionSlotItemType.java

    r4149 r5083  
    1515package com.l2jserver.gameserver.skills.conditions; 
    1616 
    17 import com.l2jserver.gameserver.model.L2ItemInstance; 
    1817import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     18import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    1919import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
    2020import com.l2jserver.gameserver.skills.Env; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/conditions/ConditionTargetBodyPart.java

    r4149 r5083  
    1515package com.l2jserver.gameserver.skills.conditions; 
    1616 
     17import com.l2jserver.gameserver.model.item.L2Armor; 
     18import com.l2jserver.gameserver.model.item.L2Item; 
    1719import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
    1820import com.l2jserver.gameserver.skills.Env; 
    19 import com.l2jserver.gameserver.templates.item.L2Armor; 
    20 import com.l2jserver.gameserver.templates.item.L2Item; 
    2121 
    2222/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/conditions/ConditionTargetUsesWeaponKind.java

    r4149 r5083  
    1515package com.l2jserver.gameserver.skills.conditions; 
    1616 
     17import com.l2jserver.gameserver.model.item.L2Weapon; 
    1718import com.l2jserver.gameserver.skills.Env; 
    18 import com.l2jserver.gameserver.templates.item.L2Weapon; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/conditions/ConditionUsingItemType.java

    r4884 r5083  
    1515package com.l2jserver.gameserver.skills.conditions; 
    1616 
    17 import com.l2jserver.gameserver.model.L2ItemInstance; 
    1817import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     18import com.l2jserver.gameserver.model.item.L2Item; 
     19import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     20import com.l2jserver.gameserver.model.item.type.L2ArmorType; 
    1921import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
    2022import com.l2jserver.gameserver.skills.Env; 
    21 import com.l2jserver.gameserver.templates.item.L2ArmorType; 
    22 import com.l2jserver.gameserver.templates.item.L2Item; 
    2323 
    2424/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/funcs/FuncEnchant.java

    r4417 r5083  
    1616 
    1717import com.l2jserver.Config; 
    18 import com.l2jserver.gameserver.model.L2ItemInstance; 
    1918import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     19import com.l2jserver.gameserver.model.item.L2Item; 
     20import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     21import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
    2022import com.l2jserver.gameserver.skills.Env; 
    2123import com.l2jserver.gameserver.skills.Stats; 
    22 import com.l2jserver.gameserver.templates.item.L2Item; 
    23 import com.l2jserver.gameserver.templates.item.L2WeaponType; 
    2424 
    2525public class FuncEnchant extends Func 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/funcs/FuncEnchantHp.java

    r4417 r5083  
    1616 
    1717import com.l2jserver.gameserver.datatables.EnchantHPBonusData; 
    18 import com.l2jserver.gameserver.model.L2ItemInstance; 
     18import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    1919import com.l2jserver.gameserver.skills.Env; 
    2020import com.l2jserver.gameserver.skills.Stats; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillAgathion.java

    r4455 r5083  
    1717import com.l2jserver.gameserver.model.L2Object; 
    1818import com.l2jserver.gameserver.model.L2Skill; 
     19import com.l2jserver.gameserver.model.StatsSet; 
    1920import com.l2jserver.gameserver.model.actor.L2Character; 
    2021import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2122import com.l2jserver.gameserver.network.SystemMessageId; 
    2223import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    23 import com.l2jserver.gameserver.templates.StatsSet; 
    2424 
    2525public class L2SkillAgathion extends L2Skill 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillAppearance.java

    r4417 r5083  
    1919import com.l2jserver.gameserver.model.L2Object; 
    2020import com.l2jserver.gameserver.model.L2Skill; 
     21import com.l2jserver.gameserver.model.StatsSet; 
    2122import com.l2jserver.gameserver.model.actor.L2Character; 
    2223import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    23 import com.l2jserver.gameserver.templates.StatsSet; 
    2424 
    2525 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillChangeWeapon.java

    r4455 r5083  
    1616 
    1717import com.l2jserver.gameserver.model.Elementals; 
    18 import com.l2jserver.gameserver.model.L2ItemInstance; 
    1918import com.l2jserver.gameserver.model.L2Object; 
    2019import com.l2jserver.gameserver.model.L2Skill; 
     20import com.l2jserver.gameserver.model.StatsSet; 
    2121import com.l2jserver.gameserver.model.actor.L2Character; 
    2222import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     23import com.l2jserver.gameserver.model.item.L2Weapon; 
     24import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2325import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
    2426import com.l2jserver.gameserver.network.SystemMessageId; 
    2527import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 
    2628import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    27 import com.l2jserver.gameserver.templates.StatsSet; 
    28 import com.l2jserver.gameserver.templates.item.L2Weapon; 
    2929 
    3030/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillChargeDmg.java

    r4915 r5083  
    2121import com.l2jserver.Config; 
    2222import com.l2jserver.gameserver.model.L2Effect; 
    23 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2423import com.l2jserver.gameserver.model.L2Object; 
    2524import com.l2jserver.gameserver.model.L2Skill; 
     25import com.l2jserver.gameserver.model.StatsSet; 
    2626import com.l2jserver.gameserver.model.actor.L2Character; 
    2727import com.l2jserver.gameserver.model.actor.L2Playable; 
    2828import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     29import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     30import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
    2931import com.l2jserver.gameserver.network.SystemMessageId; 
    3032import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    … …  
    3234import com.l2jserver.gameserver.skills.Env; 
    3335import com.l2jserver.gameserver.skills.Formulas; 
    34 import com.l2jserver.gameserver.templates.StatsSet; 
    35 import com.l2jserver.gameserver.templates.item.L2WeaponType; 
    3636 
    3737public class L2SkillChargeDmg extends L2Skill 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillCreateItem.java

    r4455 r5083  
    1717import com.l2jserver.gameserver.model.L2Object; 
    1818import com.l2jserver.gameserver.model.L2Skill; 
     19import com.l2jserver.gameserver.model.StatsSet; 
    1920import com.l2jserver.gameserver.model.actor.L2Character; 
    2021import com.l2jserver.gameserver.model.actor.L2Playable; 
    … …  
    2425import com.l2jserver.gameserver.network.serverpackets.PetItemList; 
    2526import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    26 import com.l2jserver.gameserver.templates.StatsSet; 
    2727import com.l2jserver.util.Rnd; 
    2828 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillDecoy.java

    r4426 r5083  
    1919import com.l2jserver.gameserver.model.L2Object; 
    2020import com.l2jserver.gameserver.model.L2Skill; 
     21import com.l2jserver.gameserver.model.StatsSet; 
    2122import com.l2jserver.gameserver.model.actor.L2Character; 
    2223import com.l2jserver.gameserver.model.actor.instance.L2DecoyInstance; 
    2324import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    24 import com.l2jserver.gameserver.templates.StatsSet; 
    2525import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2626 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillDefault.java

    r4417 r5083  
    1717import com.l2jserver.gameserver.model.L2Object; 
    1818import com.l2jserver.gameserver.model.L2Skill; 
     19import com.l2jserver.gameserver.model.StatsSet; 
    1920import com.l2jserver.gameserver.model.actor.L2Character; 
    2021import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    21 import com.l2jserver.gameserver.templates.StatsSet; 
    2222 
    2323public class L2SkillDefault extends L2Skill { 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillDrain.java

    r5057 r5083  
    2121import com.l2jserver.Config; 
    2222import com.l2jserver.gameserver.model.L2Effect; 
    23 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2423import com.l2jserver.gameserver.model.L2Object; 
    2524import com.l2jserver.gameserver.model.L2Skill; 
     25import com.l2jserver.gameserver.model.StatsSet; 
    2626import com.l2jserver.gameserver.model.actor.L2Character; 
    2727import com.l2jserver.gameserver.model.actor.L2Npc; 
    … …  
    3030import com.l2jserver.gameserver.model.actor.instance.L2CubicInstance; 
    3131import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     32import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3233import com.l2jserver.gameserver.network.SystemMessageId; 
    3334import com.l2jserver.gameserver.network.serverpackets.StatusUpdate; 
    3435import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    3536import com.l2jserver.gameserver.skills.Formulas; 
    36 import com.l2jserver.gameserver.templates.StatsSet; 
    3737import com.l2jserver.gameserver.templates.skills.L2TargetType; 
    3838 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillElemental.java

    r4417 r5083  
    1616 
    1717import com.l2jserver.gameserver.model.L2Effect; 
    18 import com.l2jserver.gameserver.model.L2ItemInstance; 
    1918import com.l2jserver.gameserver.model.L2Object; 
    2019import com.l2jserver.gameserver.model.L2Skill; 
     20import com.l2jserver.gameserver.model.StatsSet; 
    2121import com.l2jserver.gameserver.model.actor.L2Character; 
    2222import com.l2jserver.gameserver.model.actor.L2Summon; 
    2323import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     24import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2425import com.l2jserver.gameserver.skills.Env; 
    2526import com.l2jserver.gameserver.skills.Formulas; 
    26 import com.l2jserver.gameserver.templates.StatsSet; 
    2727 
    2828public class L2SkillElemental extends L2Skill { 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillLearnSkill.java

    r4417 r5083  
    1818import com.l2jserver.gameserver.model.L2Object; 
    1919import com.l2jserver.gameserver.model.L2Skill; 
     20import com.l2jserver.gameserver.model.StatsSet; 
    2021import com.l2jserver.gameserver.model.actor.L2Character; 
    2122import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    22 import com.l2jserver.gameserver.templates.StatsSet; 
    2323 
    2424public class L2SkillLearnSkill extends L2Skill 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillMount.java

    r5062 r5083  
    1717import com.l2jserver.gameserver.model.L2Object; 
    1818import com.l2jserver.gameserver.model.L2Skill; 
     19import com.l2jserver.gameserver.model.StatsSet; 
    1920import com.l2jserver.gameserver.model.actor.L2Character; 
    2021import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2122import com.l2jserver.gameserver.model.entity.TvTEvent; 
    2223import com.l2jserver.gameserver.network.SystemMessageId; 
    23 import com.l2jserver.gameserver.templates.StatsSet; 
    2424 
    2525public class L2SkillMount extends L2Skill 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillSiegeFlag.java

    r4996 r5083  
    2828import com.l2jserver.gameserver.model.L2Object; 
    2929import com.l2jserver.gameserver.model.L2Skill; 
     30import com.l2jserver.gameserver.model.StatsSet; 
    3031import com.l2jserver.gameserver.model.actor.L2Character; 
    3132import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    … …  
    3536import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall; 
    3637import com.l2jserver.gameserver.network.SystemMessageId; 
    37 import com.l2jserver.gameserver.templates.StatsSet; 
    3838 
    3939public class L2SkillSiegeFlag extends L2Skill 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillSignet.java

    r4975 r5083  
    2424import com.l2jserver.gameserver.model.L2Object; 
    2525import com.l2jserver.gameserver.model.L2Skill; 
     26import com.l2jserver.gameserver.model.StatsSet; 
    2627import com.l2jserver.gameserver.model.actor.L2Character; 
    2728import com.l2jserver.gameserver.model.actor.instance.L2EffectPointInstance; 
    2829import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    29 import com.l2jserver.gameserver.templates.StatsSet; 
    3030import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3131import com.l2jserver.gameserver.templates.skills.L2TargetType; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillSignetCasttime.java

    r4417 r5083  
    2222import com.l2jserver.gameserver.model.L2Object; 
    2323import com.l2jserver.gameserver.model.L2Skill; 
     24import com.l2jserver.gameserver.model.StatsSet; 
    2425import com.l2jserver.gameserver.model.actor.L2Character; 
    25 import com.l2jserver.gameserver.templates.StatsSet; 
    2626 
    2727public final class L2SkillSignetCasttime extends L2Skill 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillSpawn.java

    r5013 r5083  
    1919import com.l2jserver.gameserver.model.L2Object; 
    2020import com.l2jserver.gameserver.model.L2Skill; 
     21import com.l2jserver.gameserver.model.StatsSet; 
    2122import com.l2jserver.gameserver.model.actor.L2Character; 
    2223import com.l2jserver.gameserver.model.actor.L2Npc; 
    … …  
    2526import com.l2jserver.gameserver.model.actor.instance.L2TotemInstance; 
    2627import com.l2jserver.gameserver.model.actor.instance.L2XmassTreeInstance; 
    27 import com.l2jserver.gameserver.templates.StatsSet; 
    2828import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2929import com.l2jserver.util.Rnd; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillSummon.java

    r5013 r5083  
    2121import com.l2jserver.gameserver.model.L2Object; 
    2222import com.l2jserver.gameserver.model.L2Skill; 
     23import com.l2jserver.gameserver.model.StatsSet; 
    2324import com.l2jserver.gameserver.model.actor.L2Character; 
    2425import com.l2jserver.gameserver.model.actor.instance.L2CubicInstance; 
    … …  
    2930import com.l2jserver.gameserver.network.SystemMessageId; 
    3031import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    31 import com.l2jserver.gameserver.templates.StatsSet; 
    3232import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3333import com.l2jserver.gameserver.templates.skills.L2TargetType; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillSweeper.java

    r4417 r5083  
    1717import com.l2jserver.gameserver.model.L2Object; 
    1818import com.l2jserver.gameserver.model.L2Skill; 
     19import com.l2jserver.gameserver.model.StatsSet; 
    1920import com.l2jserver.gameserver.model.actor.L2Character; 
    20 import com.l2jserver.gameserver.templates.StatsSet; 
    2121 
    2222/** 
    2323 * @author JIV 
    24  * 
    2524 */ 
    2625public class L2SkillSweeper extends L2Skill 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillTeleport.java

    r4771 r5083  
    2222import com.l2jserver.gameserver.model.L2Skill; 
    2323import com.l2jserver.gameserver.model.Location; 
     24import com.l2jserver.gameserver.model.StatsSet; 
    2425import com.l2jserver.gameserver.model.actor.L2Character; 
    2526import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    … …  
    2829import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    2930import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    30 import com.l2jserver.gameserver.templates.StatsSet; 
    3131import com.l2jserver.gameserver.templates.skills.L2SkillType; 
    3232 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillTrap.java

    r4426 r5083  
    2121import com.l2jserver.gameserver.model.L2Skill; 
    2222import com.l2jserver.gameserver.model.L2Spawn; 
     23import com.l2jserver.gameserver.model.StatsSet; 
    2324import com.l2jserver.gameserver.model.actor.L2Character; 
    2425import com.l2jserver.gameserver.model.actor.L2Trap; 
    2526import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2627import com.l2jserver.gameserver.model.actor.instance.L2TrapInstance; 
    27 import com.l2jserver.gameserver.templates.StatsSet; 
    2828import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2929 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/templates/chars/L2CharTemplate.java

    r5010 r5083  
    1515package com.l2jserver.gameserver.templates.chars; 
    1616 
    17 import com.l2jserver.gameserver.templates.StatsSet; 
     17import com.l2jserver.gameserver.model.StatsSet; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/templates/chars/L2NpcTemplate.java

    r5031 r5083  
    3030import com.l2jserver.gameserver.model.L2NpcAIData; 
    3131import com.l2jserver.gameserver.model.L2Skill; 
     32import com.l2jserver.gameserver.model.StatsSet; 
    3233import com.l2jserver.gameserver.model.actor.instance.L2XmassTreeInstance; 
    3334import com.l2jserver.gameserver.model.base.ClassId; 
    3435import com.l2jserver.gameserver.model.quest.Quest; 
    3536import com.l2jserver.gameserver.model.quest.Quest.QuestEventType; 
    36 import com.l2jserver.gameserver.templates.StatsSet; 
    3737 
    3838/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/templates/chars/L2PcTemplate.java

    r4921 r5083  
    1919import javolution.util.FastList; 
    2020 
     21import com.l2jserver.gameserver.model.StatsSet; 
    2122import com.l2jserver.gameserver.model.base.ClassId; 
    2223import com.l2jserver.gameserver.model.base.Race; 
    23 import com.l2jserver.gameserver.templates.StatsSet; 
    2424 
    2525/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/templates/skills/L2SkillType.java

    r4969 r5083  
    1818 
    1919import com.l2jserver.gameserver.model.L2Skill; 
     20import com.l2jserver.gameserver.model.StatsSet; 
    2021import com.l2jserver.gameserver.skills.l2skills.L2SkillAgathion; 
    2122import com.l2jserver.gameserver.skills.l2skills.L2SkillAppearance; 
    … …  
    3637import com.l2jserver.gameserver.skills.l2skills.L2SkillTeleport; 
    3738import com.l2jserver.gameserver.skills.l2skills.L2SkillTrap; 
    38 import com.l2jserver.gameserver.templates.StatsSet; 
    3939 
    4040 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/util/Evolve.java

    r4981 r5083  
    2525import com.l2jserver.gameserver.datatables.NpcTable; 
    2626import com.l2jserver.gameserver.datatables.SummonItemsData; 
    27 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2827import com.l2jserver.gameserver.model.L2SummonItem; 
    2928import com.l2jserver.gameserver.model.L2World; 
    … …  
    3231import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    3332import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
     33import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3434import com.l2jserver.gameserver.network.SystemMessageId; 
    3535import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/log/EnchantFormatter.java

    r4642 r5083  
    2020import java.util.logging.LogRecord; 
    2121 
    22 import com.l2jserver.gameserver.model.L2ItemInstance; 
    2322import com.l2jserver.gameserver.model.L2Skill; 
    2423import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     24import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2525import com.l2jserver.util.StringUtil; 
    2626 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/log/ItemFilter.java

    r4981 r5083  
    1818import java.util.logging.LogRecord; 
    1919 
    20 import com.l2jserver.gameserver.model.L2ItemInstance; 
     20import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2121 
    2222 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/log/ItemLogFormatter.java

    r4417 r5083  
    2020import java.util.logging.LogRecord; 
    2121 
    22 import com.l2jserver.gameserver.model.L2ItemInstance; 
     22import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2323import com.l2jserver.util.StringUtil; 
    2424 
Note: See TracChangeset for help on using the changeset viewer.